diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 93499a10a..7503fdf02 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -2388,16 +2388,44 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl> map : certifycationInventoryListByDutyPersonMap.entrySet()) { String key = map.getKey(); - List value = map.getValue(); List userIdList = Arrays.asList(key.split(",")); - // 给责任人发消息 - this.sendMessageByTemplateId( - value, - TemplateInfoEnum2.CERTIFICATION_MESSAGE18.getValue(), - userIdList, - dutyPersonList - ); + // 任务待确认状态的数据:发送认证任务确认的催办消息 + List 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 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 toBeSubmitDataList = value.stream().filter(v -> {