diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java index 59916210..9b40bf99 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java @@ -662,6 +662,8 @@ public class ProcessProjectAssessService extends ServiceImpl standardIdList = new ArrayList<>(); + List sendMessageDTOList = new ArrayList<>(); List lawsAssessResultsList = new ArrayList<>(); List processProjectAssessTermList = businessInfoDTO.getProcessProjectAssessTermList(); for (ProcessProjectAssessTerm assessTerm : processProjectAssessTermList) { @@ -680,6 +682,7 @@ public class ProcessProjectAssessService extends ServiceImpl 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 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); + } } //各部门主管级领导下发 diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssessResults.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssessResults.java index a89bc194..b8753cb7 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssessResults.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssessResults.java @@ -96,6 +96,10 @@ public class LawsAssessResults implements Serializable { @ApiModelProperty(value = "条款号") private String termNumber; + /**条款名称*/ + @ApiModelProperty(value = "条款名称") + private String termName; + /**项目编号*/ @ApiModelProperty(value = "项目编号") private String projectNo;