From e9b86e72c138108975ff5a94a455c43d7b623d23 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 26 Oct 2023 11:20:23 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=B5=81=E7=A8=8B=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E6=9E=9A=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ActivitiController.java        | 29 -------------------
 .../controller/WorkCenterController.java      |  5 ++--
 2 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiController.java b/laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiController.java
index df3f4a31..7dcb64dc 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiController.java
@@ -212,35 +212,6 @@ public class ActivitiController {
     }
 
 
-    @ApiOperation(value="签收任务")
-    @PostMapping("/claim")
-    public Result<Object> claim(@RequestBody Map<String,Object> map) {
-        String taskId = map.get("taskId").toString();
-        String userId = map.get("userId").toString();
-        taskService.claim(taskId, userId);
-        return Result.OK();
-    }
-
-
-    /**
-     * 加签
-     */
-    @ApiOperation(value="加签/委托")
-    @GetMapping("/delegateTask")
-    public Result<Object> delegateTask(@RequestParam(value = "taskId") String taskId,
-                                       @RequestParam(value = "userId") String userId) {
-        taskService.delegateTask(taskId, userId);
-        return Result.OK();
-    }
-
-    @ApiOperation(value="解决委托")
-    @GetMapping("/resolveTask")
-    public Result<Object> resolveTask(@RequestParam(value = "taskId") String taskId) {
-        taskService.resolveTask(taskId);
-        return Result.OK();
-    }
-
-
     @GetMapping(value = "/readResource")
     @ApiOperation(value = "获取实时流程图", notes = "获取实时流程图,输出跟踪流程信息")
     public void getFlowImgByInstanceId(@RequestParam(value = "processInstanceId") String
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java b/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java
index 5f371b6b..5064524f 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java
@@ -8,6 +8,7 @@ import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.entity.ProcessApprovalRecord;
+import com.jero.modules.activiti.enums.FinishFlagEnum;
 import com.jero.modules.activiti.process.common.entity.ProcessDraft;
 import com.jero.modules.activiti.process.common.service.ProcessDraftService;
 import com.jero.modules.activiti.service.ProcessAllService;
@@ -59,7 +60,7 @@ public class WorkCenterController {
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String userId = loginUser.getId();
         queryWrapper.eq("par.user_id",userId);
-        queryWrapper.eq("par.finish_flag",0);
+        queryWrapper.eq("par.finish_flag", FinishFlagEnum.INCOMPLETE.getValue());
 
         Page<ProcessAll> page = new Page<>(pageNo, pageSize);
         IPage<ProcessAll> todoList = processAllService.getTodoList(page, queryWrapper);
@@ -76,7 +77,7 @@ public class WorkCenterController {
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String userId = loginUser.getId();
         queryWrapper.eq("par.user_id",userId);
-        queryWrapper.eq("par.finish_flag",1);
+        queryWrapper.eq("par.finish_flag",FinishFlagEnum.COMPLETE.getValue());
 
         Page<ProcessAll> page = new Page<>(pageNo, pageSize);
         IPage<ProcessAll> completedList = processAllService.getCompletedList(page, queryWrapper);