From f3f10e61d4f6d2315f1fc78ab2a1559a90fb42a3 Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Tue, 21 Mar 2023 21:33:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E6=93=8D=E4=BD=9C-=E5=8F=91=E9=80=81=E9=A3=9E?=
 =?UTF-8?q?=E4=B9=A6=E6=B6=88=E6=81=AF=E3=80=82=20=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=95=B0=E6=8D=AE=E5=AF=B9=E6=8E=A5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feishu/enums/TemplateInfoEnum2.java       |  2 ++
 ...ctCertificationInventoryEOServiceImpl.java | 21 +++++++++++++++++--
 .../wkflow/entity/ProcessHistoryEO.java       |  3 +++
 .../impl/ProcessHistoryEOServiceImpl.java     |  3 +++
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java
index 7c754a8ef..1bd954e22 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java
@@ -29,6 +29,8 @@ public enum TemplateInfoEnum2 {
     CERTIFICATION_MESSAGE21("任务提醒，责任人接收-任务 当天","ctp_AAu2lBIgnWND"),
     CERTIFICATION_MESSAGE22("任务提醒，责任人接收-任务 逾期之后 每天通知","ctp_AAuPfn0MDOYu"),
     CERTIFICATION_MESSAGE23("责任人提交，发起人接收审查任务-任务","ctp_AAuPh3LJKoIX"),
+    CERTIFICATION_MESSAGE24("发起人审查退回，责任人接收-任务","ctp_AAu2lBIgZK5f"),
+    CERTIFICATION_MESSAGE25("发起人审查通过，责任人接收通知-通知","ctp_AAuPKJ9CDwIP"),
     ;
 
     String name;
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 4eb30489a..d4ec8e3da 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
@@ -1154,7 +1154,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		}
 
 		ProjectLibraryBase projectLibraryBase = JSONObject.parseObject(JSONObject.toJSONString(json.get("projectLibraryBase")), ProjectLibraryBase.class);
-
+		List<String> dutyPersonIdList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getDutyPerson).distinct().collect(Collectors.toList());
+		List<SysUser> dutyPersonList = this.sysUserService.querySysUserListByIdList(dutyPersonIdList);
 		try {
 			// 更新数据状态为 审查退回
 			this.updateBatchById(projectCertificationInventoryEOList);
@@ -1165,6 +1166,13 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			// 更新该项目认证流程中，认证工程师的任务状态。
 			// 如果还有 结果待审查 的数据，不做操作，如果没有 将这个项目认证流程的所有认证工程师待办任务转为已办 flowStatus
 			this.updateProcessInfoDetailStatus(projectLibraryBase,CertificationFlowNodeEnum.RZGCSSC.getKey(),flowStatus);
+
+			this.sendMessageByTemplateId(
+					projectCertificationInventoryEOList,
+					TemplateInfoEnum2.CERTIFICATION_MESSAGE24.getValue(),
+					dutyPersonIdList,
+					dutyPersonList
+			);
 		}catch (Exception ex){
 			ex.printStackTrace();
 			log.error("认证工程师-审批退回失败：" + ex.getMessage());
@@ -1220,7 +1228,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		}
 
 		ProjectLibraryBase projectLibraryBase = JSONObject.parseObject(JSONObject.toJSONString(json.get("projectLibraryBase")), ProjectLibraryBase.class);
-
+		List<String> dutyPersonIdList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getDutyPerson).distinct().collect(Collectors.toList());
+		List<SysUser> dutyPersonList = this.sysUserService.querySysUserListByIdList(dutyPersonIdList);
 		try {
 			// 更新数据状态为 审查通过
 			this.updateBatchById(projectCertificationInventoryEOList);
@@ -1231,6 +1240,14 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			// 更新该项目认证流程中，认证工程师的任务状态。
 			// 如果还有 结果待审查 的数据，不做操作，如果没有 将这个项目认证流程的所有认证工程师待办任务转为已办 flowStatus
 			this.updateProcessInfoDetailStatus(projectLibraryBase,CertificationFlowNodeEnum.RZGCSSC.getKey(),flowStatus);
+
+
+			this.sendMessageByTemplateId(
+					projectCertificationInventoryEOList,
+					TemplateInfoEnum2.CERTIFICATION_MESSAGE25.getValue(),
+					dutyPersonIdList,
+					dutyPersonList
+			);
 		}catch (Exception ex){
 			ex.printStackTrace();
 			log.error("认证工程师-审批通过失败：" + ex.getMessage());
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/ProcessHistoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/ProcessHistoryEO.java
index 0cb75db7e..52e7abaa4 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/ProcessHistoryEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/ProcessHistoryEO.java
@@ -108,4 +108,7 @@ public class ProcessHistoryEO implements Serializable {
     /**附件名称，页面展示字段**/
     @TableField(exist = false)
     private String approvalFileName;;
+
+    @TableField(exist = false)
+    private String operatorResultName;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java
index fc9f17943..8b1a4d01c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java
@@ -164,6 +164,9 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl<ProcessHistoryEOMap
 				if(StringUtils.isNotEmpty(data.getOperatorResult())){
 					data.setReviewResult(ReviewResultEnum.getTextByValue(data.getOperatorResult(),cut));
 				}
+				if(StringUtils.isNotEmpty(data.getOperatorResult())){
+					data.setOperatorResultName(ReviewResultEnum.getTextByValue(data.getOperatorResult(),cut));
+				}
 				if(StringUtils.isNotEmpty(data.getOperatorPersonId()) && CollectionUtils.isNotEmpty(sysUserList)){
 					SysUser userInfo = sysUserList.stream().filter(sysUser -> sysUser.getId().equals(data.getOperatorPersonId())).collect(Collectors.toList()).get(0);
 					data.setAssignee(userInfo.getUsername());