update 未符合项跟踪流程 转办后驳回给转办后的人

laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/common/ProcessProjectNotMetCommon.java

@@ -8,6 +8,7 @@ public class ProcessProjectNotMetCommon {
     public static final String STANDARDS_ENGINEER = "standardsEngineer";
     public static final String MANAGER_LEADER = "managerLeader";
     public static final String DESIGN_ENGINEER = "designEngineer";
+    public static final String PASS = "pass";
     /**
      *法规工程师发起整改
      */

laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java

@@ -164,19 +164,40 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
                 break;
             default:
         }
-        // 完成任务
+
-        Map<String, Object> variables = new HashMap<>();
-        variables.put(ProcessProjectAssessCommon.PASS, pass);
-        taskService.complete(taskId, variables);
 
     }
 
     private void zgjldspApprove(ProcessInfoVO<ProcessProjectNotMetVO> processInfoVO, ProcessDTO processDTO, boolean pass) {
-
+        // 完成任务
+        Map<String, Object> variables = new HashMap<>();
+        if (!pass){
+            String businessId = processInfoVO.getBusinessId();
+            LambdaQueryWrapper<ProcessProjectNotMetLink> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(ProcessProjectNotMetLink::getProcessId,businessId);
+            wrapper.last("limit 1");
+            ProcessProjectNotMetLink projectNotMetLink = processProjectNotMetLinkService.getOne(wrapper);
+            String engineerId = projectNotMetLink.getEngineerId();
+            variables.put(ProcessProjectNotMetCommon.DESIGN_ENGINEER, engineerId);
+        }
+        variables.put(ProcessProjectNotMetCommon.PASS, pass);
+        taskService.complete(processDTO.getTaskId(), variables);
     }
 
     private void fggcsspApprove(ProcessInfoVO<ProcessProjectNotMetVO> processInfoVO, ProcessDTO processDTO, boolean pass) {
-
+        // 完成任务
+        Map<String, Object> variables = new HashMap<>();
+        if (!pass){
+            String businessId = processInfoVO.getBusinessId();
+            LambdaQueryWrapper<ProcessProjectNotMetLink> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(ProcessProjectNotMetLink::getProcessId,businessId);
+            wrapper.last("limit 1");
+            ProcessProjectNotMetLink projectNotMetLink = processProjectNotMetLinkService.getOne(wrapper);
+            String engineerId = projectNotMetLink.getEngineerId();
+            variables.put(ProcessProjectNotMetCommon.DESIGN_ENGINEER, engineerId);
+        }
+        variables.put(ProcessProjectNotMetCommon.PASS, pass);
+        taskService.complete(processDTO.getTaskId(), variables);
     }
 
     public void submit(ProcessInfoVO<ProcessProjectNotMetVO> processInfoVO) {
@@ -199,6 +220,7 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
         for (ProcessProjectNotMetLink processProjectNotMetLink : processProjectNotMetLinks) {
             processProjectNotMetLink.setFileId(processProjectNotMetLink.getFileId());
             processProjectNotMetLink.setDescription(processProjectNotMetLink.getDescription());
+            processProjectNotMetLink.setEngineerId(CurrentUserUtil.getId());
             processProjectNotMetLink.setRealityTime(now);
         }
         processProjectNotMetLinkService.updateBatchById(processProjectNotMetLinks);