WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

67133 认证清单催办责任人，将任务待确认与（结果待提交，审查退回）的消息分开。

Browse Source
This commit is contained in:
wangzhijiang
2023-03-29 10:21:18 +08:00
parent c2bf841579
commit b14a95dda7
1 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+36 -8
View File
@@ -2388,16 +2388,44 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
if(!ObjectUtils.isEmpty(certifycationInventoryListByDutyPersonMap) && CollectionUtils.isNotEmpty(dutyPersonList)){
for (Map.Entry<String, List<ProjectCertificationInventoryEO>> map : certifycationInventoryListByDutyPersonMap.entrySet()) {
String key = map.getKey();
List<ProjectCertificationInventoryEO> value = map.getValue();
List<String> userIdList = Arrays.asList(key.split(","));
// 给责任人发消息
this.sendMessageByTemplateId(
value,
TemplateInfoEnum2.CERTIFICATION_MESSAGE18.getValue(),
userIdList,
dutyPersonList
);
// 任务待确认状态的数据：发送认证任务确认的催办消息
List<ProjectCertificationInventoryEO> toBeConfirmedPciEoList = map.getValue().stream().filter(pciEo -> {
boolean flag = false;
if(StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())){
flag = true;
}
return flag;
}).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(toBeConfirmedPciEoList)) {
// 给责任人发消息
this.sendMessageByTemplateId(
toBeConfirmedPciEoList,
TemplateInfoEnum2.CERTIFICATION_MESSAGE16.getValue(),
userIdList,
dutyPersonList
);
}
List<ProjectCertificationInventoryEO> toBeSubmitOrReturnPciEoList = map.getValue().stream().filter(pciEo -> {
boolean flag = false;
if(StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
|| StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())){
flag = true;
}
return flag;
}).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(toBeSubmitOrReturnPciEoList)) {
// 给责任人发消息
this.sendMessageByTemplateId(
toBeSubmitOrReturnPciEoList,
TemplateInfoEnum2.CERTIFICATION_MESSAGE18.getValue(),
userIdList,
dutyPersonList
);
}
/*// 待提交数据 单独发消息
List<ProjectCertificationInventoryEO> toBeSubmitDataList = value.stream().filter(v -> {