update 项目合规评估流程 各部门主管级领导驳回后，生成待办时人员错误

laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java

@@ -10,7 +10,9 @@ import cn.hutool.core.stream.StreamUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.RandomUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.jero.common.api.dto.message.SendMessageDTO;
 import com.jero.common.api.vo.ResultCommon;
+import com.jero.common.api.vo.SendMessageAPI;
 import com.jero.common.constant.CommonConstant;
 import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
@@ -34,6 +36,7 @@ import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
 import com.jero.modules.activiti.process.projectassess.vo.ProcessProjectAssessVO;
 import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.activiti.service.ProcessApprovalRecordService;
+import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon;
 import com.jero.modules.laws.common.util.CurrentUserUtil;
 import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
 import com.jero.modules.laws.standard.entity.LawsOverseasStandard;
@@ -63,6 +66,7 @@ import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAsse
 import com.jero.modules.activiti.process.projectassess.mapper.ProcessProjectAssessMapper;
 import org.springframework.transaction.annotation.Transactional;
 
+import static cn.hutool.poi.excel.sax.ElementName.v;
 import static org.apache.tools.ant.taskdefs.SetPermissions.NonPosixMode.pass;
 
 /**
@@ -100,19 +104,9 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
     //海外标准
     @Autowired
     private ILawsOverseasStandardService lawsOverseasStandardService;
+    @Resource
+    private SendMessageAPI sendMessageAPI;
     HashMap<String, String> tempCache = new HashMap<>();
-    public void add(ProcessProjectAssess processProjectAssess) {
-        this.save(processProjectAssess);
-    }
-
-    public void editById(ProcessProjectAssess processProjectAssess) {
-        this.updateById(processProjectAssess);
-    }
-
-    public ProcessProjectAssess queryById(String id) {
-        ProcessProjectAssess processProjectAssess = this.getById(id);
-        return processProjectAssess;
-    }
 
     public ProcessInfoVO<ProcessProjectAssessVO> queryProcessInfoVO(String draftId, String processInstanceId, String taskId) {
         if (StringUtils.isNotBlank(draftId) && StringUtils.isBlank(taskId)) {
@@ -316,7 +310,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
         }
         processProjectAssessTermService.saveBatch(processProjectAssessTermList);
         //保存条款和负责人的关联关系
-        List<String> AllResponsibleUnitLeaderList = new ArrayList<>();
+        List<String> allResponsibleUnitLeaderList = new ArrayList<>();
         List<ProcessProjectAssessTermUser> saveProcessProjectAssessTermUserList = new ArrayList<>();
         for (ProcessProjectAssessTerm processProjectAssessTerm : processProjectAssessTermList) {
             String termId = processProjectAssessTerm.getId();
@@ -340,9 +334,9 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
                 processProjectAssessTermUser.setResponsibleUnitLeader(responsibleUnitLeader);
                 saveProcessProjectAssessTermUserList.add(processProjectAssessTermUser);
             }
-            AllResponsibleUnitLeaderList.addAll(distinctResponsibleUnitLeader);
+            allResponsibleUnitLeaderList.addAll(distinctResponsibleUnitLeader);
         }
-        List<String> distinctAllResponsibleUnitLeaderList = AllResponsibleUnitLeaderList.stream().distinct().collect(Collectors.toList());
+        List<String> distinctAllResponsibleUnitLeaderList = allResponsibleUnitLeaderList.stream().distinct().collect(Collectors.toList());
         String distinctAllResponsibleUnitLeaderListJoin = CollectionUtil.join(distinctAllResponsibleUnitLeaderList, ",");
         processProjectAssessTermUserService.saveBatch(saveProcessProjectAssessTermUserList);
 
@@ -417,12 +411,21 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
             allTermUserList.add(termUser);
         }
         processProjectAssessTermUserService.updateBatchById(allTermUserList);
+        String assessmentId = processInfoVO.getBusinessId();
+        ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord();
+        String originUserId = processApprovalRecord.getOriginUserId();
+        LambdaQueryWrapper<ProcessProjectAssessTermUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ProcessProjectAssessTermUser::getAssessmentId, assessmentId);
+        wrapper.eq(ProcessProjectAssessTermUser::getResponsibleUnitLeader, originUserId);
+        List<ProcessProjectAssessTermUser> projectAssessTermUsers = processProjectAssessTermUserService.list(wrapper);
+        List<String> moduleOwnerList = projectAssessTermUsers.stream().map(ProcessProjectAssessTermUser::getModuleOwner).distinct().collect(Collectors.toList());
 
         tempCache.put(ProcessProjectAssessCommon.EXECUTION_ID, executionId);
         // 完成任务
         String taskId = processDTO.getTaskId();
         Map<String, Object> variables = new HashMap<>();
         variables.put(ProcessProjectAssessCommon.PASS, pass);
+        variables.put(ProcessProjectAssessCommon.MODULE_OWNER_LIST, moduleOwnerList);
         taskService.complete(taskId, variables);
     }
 

laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/vo/ProcessProjectAssessVO.java

@@ -42,4 +42,7 @@ public class ProcessProjectAssessVO {
     /**征求意见列表*/
     @ApiModelProperty(value = "关联标准分派列表")
     private List<ProcessProjectAssessTermUser> processProjectAssessTermUserList;
+
+    @ApiModelProperty(value = "抄送人员")
+    private String carbonCopyPersonnels;
 }