流程修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ActivitiServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qmth.distributed.print.business.entity.ExamTask;
 import com.qmth.distributed.print.business.entity.TFFlowApprove;
 import com.qmth.distributed.print.business.entity.TFFlowLog;
+import com.qmth.distributed.print.business.enums.ExamStatusEnum;
 import com.qmth.distributed.print.business.service.ActivitiService;
 import com.qmth.distributed.print.business.service.ExamTaskService;
 import com.qmth.distributed.print.business.service.TFFlowApproveService;
@@ -214,6 +215,9 @@ public class ActivitiServiceImpl implements ActivitiService {
         }
         String flowTaskId = (String) map.get(SystemConstant.FLOW_TASK_ID);
         Task task = taskService.createTaskQuery().taskId(flowTaskId).singleResult();
+        if (Objects.isNull(task)) {
+            throw ExceptionResultEnum.ERROR.exception("流程任务为空");
+        }
         String processInstanceId = task.getProcessInstanceId();
         QueryWrapper<ExamTask> examTaskQueryWrapper = new QueryWrapper<>();
         examTaskQueryWrapper.lambda().eq(ExamTask::getFlowId, Long.parseLong(processInstanceId));
@@ -250,6 +254,9 @@ public class ActivitiServiceImpl implements ActivitiService {
                         tfFlowLog.setApproveOperation(FlowApproveOperationEnum.REJECT);
                         tfFlowApprove.setStatus(FlowStatusEnum.REJECT);
                         tfFlowApprove.setSetup(FlowGdykdxApproveSetupEnum.SUBMIT.getSetup());
+//                        examTask.setStatus(ExamStatusEnum.DRAFT);
+//                        examTask.updateInfo(sysUser.getId());
+//                        examTaskService.updateById(examTask);
                     } else if (Objects.equals(approve, "1")) {//提交
                         tfFlowLog.setApproveOperation(FlowApproveOperationEnum.APPROVE);
                         tfFlowApprove.setStatus(FlowStatusEnum.AUDITING);
@@ -267,6 +274,9 @@ public class ActivitiServiceImpl implements ActivitiService {
                         tfFlowLog.setApproveOperation(FlowApproveOperationEnum.REJECT);
                         tfFlowApprove.setStatus(FlowStatusEnum.REJECT);
                         tfFlowApprove.setSetup(FlowGdykdxApproveSetupEnum.SUBMIT.getSetup());
+//                        examTask.setStatus(ExamStatusEnum.DRAFT);
+//                        examTask.updateInfo(sysUser.getId());
+//                        examTaskService.updateById(examTask);
                     } else if (Objects.equals(approve, "1")) {//驳回主任
                         tfFlowLog.setApproveOperation(FlowApproveOperationEnum.REJECT);
                         tfFlowApprove.setStatus(FlowStatusEnum.REJECT);

distributed-print-business/src/main/resources/mapper/ExamTaskMapper.xml

@@ -694,16 +694,17 @@
         (
         select
         t.USER_ID_ as userId,
-        t.TASK_ID_ as taskId
+        t.TASK_ID_ as taskId,
+        t.PROC_INST_ID_ as procInstId
         from act_ru_identitylink t
         where
             EXISTS(
             select art.ID_ from exam_task et
             left join ACT_RU_TASK art on art.PROC_INST_ID_ = et.flow_id
-            where art.ID_ = t.TASK_ID_
+            where (art.ID_ = t.TASK_ID_ or art.PROC_INST_ID_ = t.PROC_INST_ID_)
             )
         and t.USER_ID_ = #{userId}) flow
-        left join ACT_RU_TASK art on art.ID_ = flow.taskId
+        left join ACT_RU_TASK art on (art.ID_ = flow.taskId or art.PROC_INST_ID_ = flow.procInstId)
         left join exam_task et on et.flow_id = art.PROC_INST_ID_
         LEFT JOIN
         basic_card_rule b ON et.card_rule_id = b.id

distributed-print/src/main/java/com/qmth/distributed/print/api/TFFlowController.java

@@ -151,9 +151,13 @@ public class TFFlowController {
     @ApiOperation(value = "审批流程")
     @ApiResponses({@ApiResponse(code = 200, message = "用户信息", response = ResultUtil.class)})
     @RequestMapping(value = "/task/approve", method = RequestMethod.POST)
-    public Result teachTaskList(@ApiParam(value = "流程任务id", required = true) @RequestParam String taskId) {
+    public Result teachTaskList(@ApiParam(value = "流程任务id", required = true) @RequestParam String taskId,
+                                @ApiParam(value = "流程变量", required = false) @RequestParam(required = false) String approve,
+                                @ApiParam(value = "流程审核意见", required = false) @RequestParam(required = false) String remark) {
         Map<String, Object> map = new HashMap<>();
         map.computeIfAbsent(SystemConstant.FLOW_TASK_ID, v -> taskId);
+        map.computeIfAbsent(SystemConstant.APPROVE, v -> approve);
+        map.computeIfAbsent(SystemConstant.APPROVE_REMARK, v -> remark);
         activitiService.taskApprove(map);
         return ResultUtil.ok();
     }