From e85cd3fe826efe0baaa3fc09ea371467127c370c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 15 七月 2025 18:11:31 +0800
Subject: [PATCH] Merge branch 'dev'
---
business/src/main/java/com/ycl/controller/ProjectProcessController.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/business/src/main/java/com/ycl/controller/ProjectProcessController.java b/business/src/main/java/com/ycl/controller/ProjectProcessController.java
index ad5a07b..1e1644d 100644
--- a/business/src/main/java/com/ycl/controller/ProjectProcessController.java
+++ b/business/src/main/java/com/ycl/controller/ProjectProcessController.java
@@ -1,5 +1,8 @@
package com.ycl.controller;
+import com.ycl.common.annotation.Log;
+import com.ycl.common.core.domain.AjaxResult;
+import com.ycl.common.enums.BusinessType;
import com.ycl.common.group.Update;
import com.ycl.common.group.Add;
import com.ycl.domain.form.*;
@@ -112,6 +115,15 @@
return result;
}
+ @GetMapping("/wait_task")
+ @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
+// @PreAuthorize("@ss.hasPermi('projectProcess:page')")
+ public Result getWaitTask(ProjectProcessQuery query) {
+ Result result = Result.ok();
+ projectProcessService.getIndexWaitTask("", (int) query.getPageSize(), (int) query.getCurrentPage(), result);
+ return result;
+ }
+
@GetMapping("/detail-by-process_ins_id")
@ApiOperation(value = "鑾峰彇璇︽儏", notes = "鑾峰彇璇︽儏")
// @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
@@ -147,4 +159,11 @@
public Result cancelTaskHangup(@Validated @RequestBody TaskHangupForm form) {
return projectProcessService.cancelTaskHangup(form);
}
+
+ @ApiOperation(value = "淇敼宸插畬鎴愪换鍔�")
+ @Log(title = "淇敼宸插畬鎴愪换鍔�", businessType = BusinessType.UPDATE)
+ @PostMapping(value = "/admin/edit/finish/task")
+ public Result editFinishedTask(@RequestBody EditFinishedTaskForm form) {
+ return projectProcessService.editFinishedTask(form);
+ }
}
--
Gitblit v1.8.0