update 工作中心 加签，解决加签，转签

laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiController.java

@@ -6,12 +6,12 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.DictPoint;
 import com.jero.common.constant.enums.LanguageEnum;
-import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.MessageUtils;
 import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.entity.ProcessApprovalRecord;
 import com.jero.modules.activiti.entity.ProcessNode;
+import com.jero.modules.activiti.enums.FinishFlagEnum;
 import com.jero.modules.activiti.service.*;
 import com.jero.modules.laws.common.constant.ResultCommon;
 import io.swagger.annotations.*;
@@ -155,11 +155,11 @@ public class ActivitiController {
         }else if ("其他起草人线下填写，上传".equals(taskName)){
         }
         //更新审批表为完成，填充数据
-        ProcessApprovalRecord approvalRecord = processApprovalRecordService.getByTaskId(taskId);
+        ProcessApprovalRecord approvalRecord = processApprovalRecordService.getToDoByTaskId(taskId);
         approvalRecord.setCommitFlag(commitFlag);
         approvalRecord.setCommitText(commitText);
         approvalRecord.setCommitFile(commitFile);
-        approvalRecord.setFinishFlag(YesOrNoEnum.YES.getInteger());
+        approvalRecord.setFinishFlag(FinishFlagEnum.COMPLETE.getValue());
         approvalRecord.setEndTime(new Date());
         processApprovalRecordService.updateById(approvalRecord);
         //审批节点

laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java

@@ -7,7 +7,11 @@ import com.jero.common.api.vo.Result;
 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.process.common.entity.ProcessDraft;
+import com.jero.modules.activiti.process.common.service.ProcessDraftService;
 import com.jero.modules.activiti.service.ProcessAllService;
+import com.jero.modules.activiti.vo.DelegateTaskParam;
+import com.jero.modules.activiti.vo.ResolveTaskParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -38,6 +42,8 @@ public class WorkCenterController {
 
     @Resource
     private ProcessAllService processAllService;
+    @Resource
+    private ProcessDraftService processDraftService;
 
     @ApiOperation(value = "查询待办流程列表")
     @GetMapping("/getTodoList")
@@ -102,6 +108,24 @@ public class WorkCenterController {
         return Result.OK(sentList);
     }
 
+    @ApiOperation(value = "查询草稿")
+    @GetMapping("/getDraftList")
+    public Result<?> getDraftList(ProcessDraft processDraft,
+                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                  HttpServletRequest req) {
+        QueryWrapper<ProcessDraft> queryWrapper = new QueryWrapper<>();
+        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String userId = loginUser.getId();
+        queryWrapper.eq("create_by",userId);
+        Integer prcType = processDraft.getPrcType();
+        queryWrapper.eq(prcType != null, "prc_type", prcType);
+
+        Page<ProcessDraft> page = new Page<>(pageNo, pageSize);
+        IPage<ProcessDraft> sentList = processDraftService.page(page, queryWrapper);
+        return Result.OK(sentList);
+    }
+
     @NotNull
     private QueryWrapper<ProcessAll> getProcessAllQueryWrapper(ProcessAll processAll) {
         String prcName = processAll.getPrcName();
@@ -126,4 +150,33 @@ public class WorkCenterController {
         processAllService.delete(processInstanceId);
         return Result.OK();
     }
+
+    /**
+     * 加签
+     */
+    @ApiOperation(value="加签")
+    @PostMapping("/delegateTask")
+    public Result<Object> delegateTask(@RequestBody DelegateTaskParam param) {
+        processAllService.delegateTask(param);
+        return Result.OK();
+    }
+
+    @ApiOperation(value="解决加签")
+    @PostMapping("/resolveTask")
+    public Result<Object> resolveTask(@RequestBody ResolveTaskParam param) {
+        processAllService.resolveTask(param);
+        return Result.OK();
+    }
+
+    /**
+     * 转签
+     */
+    @ApiOperation(value="转签")
+    @PostMapping("/transferTask")
+    public Result<Object> transferTask(@RequestBody DelegateTaskParam param) {
+        processAllService.transferTask(param);
+        return Result.OK();
+    }
+
+
 }