ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 81455 法规合规评估流程-法规工程师审批节点，选择抄送人员，收到消息不对

Browse Source
This commit is contained in:
lijiarao
2024-01-31 20:25:02 +08:00
parent e827a956dd
commit 27b3ba1fff
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
+7 -4
View File
@@ -564,7 +564,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
//查询表单 //查询表单
ProcessProjectStandardVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); ProcessProjectStandardVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
List<ProcessProjectStandardTerm> termList = businessInfoDTO.getProcessProjectStandardTermList(); List<ProcessProjectStandardTerm> termList = businessInfoDTO.getProcessProjectStandardTermList();
List<String> carbonCopyPersonnelList = new ArrayList<>();
List<ProcessProjectStandardTerm> updateTermList = new ArrayList<>(); List<ProcessProjectStandardTerm> updateTermList = new ArrayList<>();
List<ProcessProjectStandardTermUser> updateTermUserList = new ArrayList<>(); List<ProcessProjectStandardTermUser> updateTermUserList = new ArrayList<>();
Date date = new Date(); Date date = new Date();
@@ -579,7 +579,6 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
term1.setId(termId); term1.setId(termId);
term1.setDesignEngineer(designEngineer); term1.setDesignEngineer(designEngineer);
updateTermList.add(term1); updateTermList.add(term1);
carbonCopyPersonnelList.addAll(Arrays.asList(term.getCarbonCopyPersonnels().split(",")));
LawsSpecialProjectLibrary projectLibrary = new LawsSpecialProjectLibrary(); LawsSpecialProjectLibrary projectLibrary = new LawsSpecialProjectLibrary();
projectLibrary.setSource(processProjectStandard.getSource()); projectLibrary.setSource(processProjectStandard.getSource());
@@ -671,6 +670,8 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
taskService.complete(taskId, variables); taskService.complete(taskId, variables);
if (pass){ if (pass){
for (ProcessProjectStandardTerm term : termList) {
List<String> carbonCopyPersonnelList = Arrays.asList(term.getCarbonCopyPersonnels().split(","));
//发送消息 //发送消息
String carbonCopyPersonnels = carbonCopyPersonnelList.stream().distinct().collect(Collectors.joining(",")); String carbonCopyPersonnels = carbonCopyPersonnelList.stream().distinct().collect(Collectors.joining(","));
SendMessageDTO sendMessageDTO = new SendMessageDTO(); SendMessageDTO sendMessageDTO = new SendMessageDTO();
@@ -678,14 +679,16 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
sendMessageDTO.setToUserId(carbonCopyPersonnels); sendMessageDTO.setToUserId(carbonCopyPersonnels);
Map<String, String> sendMap = new HashMap<>(); Map<String, String> sendMap = new HashMap<>();
sendMap.put("prcName", process.getPrcName()); sendMap.put("prcName", process.getPrcName());
sendMap.put("termNumber", process.getPrcName()); sendMap.put("termNumber", term.getTermNumber());
sendMap.put("termName", process.getPrcName()); sendMap.put("termName", term.getTermName());
sendMessageDTO.setMap(sendMap); sendMessageDTO.setMap(sendMap);
sendMessageAPI.sendMessage(sendMessageDTO); sendMessageAPI.sendMessage(sendMessageDTO);
} }
} }
}
//部所主管级领导下发 //部所主管级领导下发
private void bszgjldxfSubmit(ProcessInfoVO<ProcessProjectStandardVO> processInfoVO, ProcessDTO processDTO) { private void bszgjldxfSubmit(ProcessInfoVO<ProcessProjectStandardVO> processInfoVO, ProcessDTO processDTO) {
String businessId = processInfoVO.getBusinessId(); String businessId = processInfoVO.getBusinessId();