Merge remote-tracking branch 'origin/dev_v3.0.0' into dev_v3.0.0

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

@@ -17,17 +17,13 @@ import com.qmth.distributed.print.business.templete.execute.AsyncCreatePdfTemple
 import com.qmth.teachcloud.common.bean.dto.MqDto;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.FlowStatusEnum;
-import com.qmth.teachcloud.common.enums.MqTagEnum;
-import com.qmth.teachcloud.common.enums.TaskTypeEnum;
+import com.qmth.teachcloud.common.enums.*;
 import com.qmth.teachcloud.common.service.SysUserService;
 import com.qmth.teachcloud.common.service.TBTaskService;
 import com.qmth.teachcloud.common.service.TeachcloudCommonService;
 import com.qmth.teachcloud.common.util.RedisUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import org.activiti.engine.TaskService;
-import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -388,10 +384,11 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
                 // 审核一级
                 Task task = taskService.createTaskQuery().processInstanceId(String.valueOf(flowId)).singleResult();
                 if (Objects.nonNull(task)) {
-                    Map<String, Object> map1 = new HashMap<>();
-                    map1.computeIfAbsent(SystemConstant.FLOW_TASK_ID, v -> task.getId());
-                    map1.computeIfAbsent(SystemConstant.PAPAER_ATTACHMENT_IDS, v -> examTaskDetail.getPaperAttachmentIds());
-                    activitiService.taskApprove(map1);
+                    Map<String, Object> approverMap = new HashMap<>();
+                    approverMap.computeIfAbsent(SystemConstant.FLOW_TASK_ID, v -> task.getId());
+                    approverMap.computeIfAbsent(SystemConstant.PAPAER_ATTACHMENT_IDS, v -> examTaskDetail.getPaperAttachmentIds());
+                    approverMap.computeIfAbsent(SystemConstant.APPROVE_OPERATION, v -> FlowApprovePassEnum.PASS);
+                    activitiService.taskApprove(approverMap);
                 }
             }
         }

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

@@ -30,7 +30,6 @@ import com.qmth.teachcloud.common.util.*;
 import com.qmth.teachcloud.common.util.excel.ExcelError;
 import org.activiti.engine.ActivitiObjectNotFoundException;
 import org.activiti.engine.TaskService;
-import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -994,6 +993,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                 map.computeIfAbsent(SystemConstant.FLOW_TASK_ID, v -> task.getId());
 //                map.computeIfAbsent(SystemConstant.APPROVE_USER_IDS, v -> examTaskDetail.getApproveUserIds());
                 map.computeIfAbsent(SystemConstant.PAPAER_ATTACHMENT_IDS, v -> examTaskDetail.getPaperAttachmentIds());
+                map.computeIfAbsent(SystemConstant.APPROVE_OPERATION, v -> FlowApprovePassEnum.PASS);
                 activitiService.taskApprove(map);
             }
         }
@@ -1541,11 +1541,12 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                     // 审核一级
                     Task task = taskService.createTaskQuery().processInstanceId(String.valueOf(examTask.getFlowId())).singleResult();
                     if (Objects.nonNull(task)) {
-                        Map<String, Object> map1 = new HashMap<>();
-                        map1.computeIfAbsent(SystemConstant.FLOW_TASK_ID, v -> task.getId());
+                        Map<String, Object> map = new HashMap<>();
+                        map.computeIfAbsent(SystemConstant.FLOW_TASK_ID, v -> task.getId());
 //                        map1.computeIfAbsent(SystemConstant.APPROVE_USER_IDS, v -> examTaskApplyParam.getApproveUserIds());
-                        map1.computeIfAbsent(SystemConstant.PAPAER_ATTACHMENT_IDS, v -> examTaskDetail.getPaperAttachmentIds());
-                        activitiService.taskApprove(map1);
+                        map.computeIfAbsent(SystemConstant.PAPAER_ATTACHMENT_IDS, v -> examTaskDetail.getPaperAttachmentIds());
+                        map.computeIfAbsent(SystemConstant.APPROVE_OPERATION, v -> FlowApprovePassEnum.PASS);
+                        activitiService.taskApprove(map);
                     }
                 }
             }
@@ -1686,7 +1687,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             Long examId = examTask.getId();
             String courseCode = examTask.getCourseCode();
             ExamDetailParams examDetailParams = JSONObject.parseObject(String.valueOf(jsonObject.get("examDetail")), ExamDetailParams.class);
-            BasicPrintConfig basicPrintConfig = basicPrintConfigService.getByExamIdAndCourseCode(examId,courseCode);
+            BasicPrintConfig basicPrintConfig = basicPrintConfigService.getByExamIdAndCourseCode(examId, courseCode);
             ExamPrintPlan examPrintPlan = new ExamPrintPlan();
             examPrintPlan.insertInfo(sysUser.getId());
             examPrintPlan.setSchoolId(schoolId);
@@ -1768,11 +1769,12 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                 // 审核一级
                 Task task = taskService.createTaskQuery().processInstanceId(String.valueOf(examTask.getFlowId())).singleResult();
                 if (Objects.nonNull(task)) {
-                    Map<String, Object> map1 = new HashMap<>();
-                    map1.computeIfAbsent(SystemConstant.FLOW_TASK_ID, v -> task.getId());
+                    Map<String, Object> map = new HashMap<>();
+                    map.computeIfAbsent(SystemConstant.FLOW_TASK_ID, v -> task.getId());
 //                    map1.computeIfAbsent(SystemConstant.APPROVE_USER_IDS, v -> examTaskApplyTemp.getApproveUserIds());
-                    map1.computeIfAbsent(SystemConstant.PAPAER_ATTACHMENT_IDS, v -> examTaskDetail.getPaperAttachmentIds());
-                    activitiService.taskApprove(map1);
+                    map.computeIfAbsent(SystemConstant.APPROVE_OPERATION, v -> FlowApprovePassEnum.PASS);
+                    map.computeIfAbsent(SystemConstant.PAPAER_ATTACHMENT_IDS, v -> examTaskDetail.getPaperAttachmentIds());
+                    activitiService.taskApprove(map);
                 }
             }
             return examTask;
@@ -1976,10 +1978,11 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
 
         String flowTaskId = examTaskReApplyParam.getFlowTaskId();
 
-        Map<String, Object> map1 = new HashMap<>();
-        map1.putIfAbsent(SystemConstant.FLOW_TASK_ID, flowTaskId);
-        map1.computeIfAbsent(SystemConstant.PAPAER_ATTACHMENT_IDS, v -> examTaskDetail.getPaperAttachmentIds());
-        activitiService.taskApprove(map1);
+        Map<String, Object> map = new HashMap<>();
+        map.putIfAbsent(SystemConstant.FLOW_TASK_ID, flowTaskId);
+        map.computeIfAbsent(SystemConstant.PAPAER_ATTACHMENT_IDS, v -> examTaskDetail.getPaperAttachmentIds());
+        map.computeIfAbsent(SystemConstant.APPROVE_OPERATION, v -> FlowApprovePassEnum.PASS);
+        activitiService.taskApprove(map);
     }
 
     @Override