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

fix 80086 项目合规评估流程结束后给抄送人员发消息

Browse Source
This commit is contained in:
lijiarao
2024-02-03 18:41:10 +08:00
parent 501d6ef20e
commit 33eaacfecc
2 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
+32 -11
View File
@@ -662,6 +662,8 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
String taskId = processDTO.getTaskId();
taskService.complete(taskId);
//同步数据到项目库的评估结果
List<String> standardIdList = new ArrayList<>();
List<SendMessageDTO> sendMessageDTOList = new ArrayList<>();
List<LawsAssessResults> lawsAssessResultsList = new ArrayList<>();
List<ProcessProjectAssessTerm> processProjectAssessTermList = businessInfoDTO.getProcessProjectAssessTermList();
for (ProcessProjectAssessTerm assessTerm : processProjectAssessTermList) {
@@ -680,6 +682,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
//lawsAssessResults.setTermId(assessTerm.getSplitInfoId());
lawsAssessResults.setStandardId(assessTerm.getStandardId());
lawsAssessResults.setTermNumber(assessTerm.getTermNumber());
lawsAssessResults.setTermName(assessTerm.getTermName());
lawsAssessResults.setFileId(assessTerm.getFileId());
lawsAssessResults.setRiskPoints(assessTerm.getRiskPoints());
lawsAssessResults.setValidateSolution(assessTerm.getValidateSolution());
@@ -691,6 +694,32 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
lawsAssessResults.setProcessDefinitionId(processDTO.getProcessDefinitionId());
lawsAssessResults.setProcessInstanceId(processDTO.getProcessInstanceId());
lawsAssessResultsList.add(lawsAssessResults);
String standardId = assessTerm.getStandardId();
LawsDomesticStandard domesticStandard = lawsDomesticStandardService.getById(standardId);
String standardName;
String standardNumber;
if (domesticStandard != null){
standardName = domesticStandard.getStandardName();
standardNumber = domesticStandard.getStandardNumber();
}else {
LawsOverseasStandard overseasStandard = lawsOverseasStandardService.getById(standardId);
standardName = overseasStandard.getStandardName();
standardNumber = overseasStandard.getStandardNumber();
}
if (!standardIdList.contains(standardId)) {
standardIdList.add(standardId);
//发送消息
String carbonCopyPersonnels = businessInfoDTO.getCarbonCopyPersonnels();
SendMessageDTO sendMessageDTO = new SendMessageDTO();
sendMessageDTO.setTemplateCode(MessageTemplateCodeCommon.PROJECT_ASSESS_COMPLETE);
sendMessageDTO.setToUserId(carbonCopyPersonnels);
Map<String, String> sendMap = new HashMap<>();
sendMap.put("standardNumber", standardNumber);
sendMap.put("standardName", standardName);
sendMap.put("projectName", lawsProjectLibrary.getProjectName());
sendMessageDTO.setMap(sendMap);
sendMessageDTOList.add(sendMessageDTO);
}
}
lawsAssessResultsService.saveBatch(lawsAssessResultsList);
@@ -766,17 +795,9 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
}
lawsEvaluationNotMetService.saveBatch(evaluationNotMetList);
//发送消息
String carbonCopyPersonnels = businessInfoDTO.getCarbonCopyPersonnels();
SendMessageDTO sendMessageDTO = new SendMessageDTO();
sendMessageDTO.setTemplateCode(MessageTemplateCodeCommon.PROJECT_ASSESS_COMPLETE);
sendMessageDTO.setToUserId(carbonCopyPersonnels);
Map<String, String> sendMap = new HashMap<>();
ProcessAll process = processAllService.getByProcessInstanceId(processDTO.getProcessInstanceId());
sendMap.put("prcNum", process.getPrcNum());
sendMap.put("prcName", process.getPrcName());
sendMap.put("projectName", lawsProjectLibrary.getProjectName());
sendMessageDTO.setMap(sendMap);
sendMessageAPI.sendMessage(sendMessageDTO);
for (SendMessageDTO sendMessageDTO : sendMessageDTOList) {
sendMessageAPI.sendMessage(sendMessageDTO);
}
}
//各部门主管级领导下发
laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssessResults.java
+4
View File
@@ -96,6 +96,10 @@ public class LawsAssessResults implements Serializable {
@ApiModelProperty(value = "条款号")
private String termNumber;
/**条款名称*/
@ApiModelProperty(value = "条款名称")
private String termName;
/**项目编号*/
@ApiModelProperty(value = "项目编号")
private String projectNo;