From b14a95dda7a58ca9fa355f79f74b4c4dcd9017bc Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Wed, 29 Mar 2023 10:21:18 +0800
Subject: [PATCH] =?UTF-8?q?67133=20=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=82=AC=E5=8A=9E=E8=B4=A3=E4=BB=BB=E4=BA=BA=EF=BC=8C=E5=B0=86?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=BE=85=E7=A1=AE=E8=AE=A4=E4=B8=8E=EF=BC=88?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E5=BE=85=E6=8F=90=E4=BA=A4=EF=BC=8C=E5=AE=A1?=
 =?UTF-8?q?=E6=9F=A5=E9=80=80=E5=9B=9E=EF=BC=89=E7=9A=84=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=88=86=E5=BC=80=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ctCertificationInventoryEOServiceImpl.java | 44 +++++++++++++++----
 1 file changed, 36 insertions(+), 8 deletions(-)

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<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 -> {