From 0a0902cba66d34126dde5fd99948d462224d087f Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Tue, 5 Jul 2022 16:20:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E3=80=81prehomo=E3=80=81?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=20=E4=B8=8B=E5=8F=91dre=EF=BC=8C=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6=E5=8F=91=E8=BF=87=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ProjectTaskInventoryDetailEO.java     |  4 ++++
 .../ProjectTaskInventoryDetailEOServiceImpl.java | 16 +++++++++++++++-
 .../impl/ProjectTaskInventoryEOServiceImpl.java  |  2 +-
 .../wkflow/enums/DesignComplianceNodeEnum.java   |  2 ++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java
index d1b24903c..38be4e214 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java
@@ -119,4 +119,8 @@ public class ProjectTaskInventoryDetailEO implements Serializable {
 
     @ApiModelProperty(value = "工程交付说明")
     private String deliveryInstructions;
+
+    /**是否发送过消息 对应枚举 SendMsgFlagEnum**/
+    @TableField(exist = false)
+    private String isSend;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
index 64f7b3868..87566e6cd 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
@@ -13,6 +13,7 @@ import com.jero.modules.feishu.vo.FeishuMsgVo;
 import com.jero.modules.project.entity.*;
 import com.jero.modules.project.enums.JumpLinkEnum;
 import com.jero.modules.project.enums.MsgTypeEnum;
+import com.jero.modules.project.enums.SendMsgFlagEnum;
 import com.jero.modules.project.mapper.*;
 import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService;
 import com.jero.modules.project.service.IProjectTaskInventoryFeedbackEOService;
@@ -27,6 +28,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 项目库-任务清单明细表
@@ -150,7 +152,19 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 			this.baseMapper.delete(deleteWrapper);
 
 			super.saveBatch(projectTaskInventoryDetailEOAddList);
-			sendMessage(taskInventoryDetail,userIdList);
+			//获取没有发送过消息的用户
+			List<String> sendUserIdList = projectTaskInventoryDetailEOAddList.stream().filter(e -> {
+				boolean flag = true;
+				if(StringUtils.isNotEmpty(e.getIsSend())){
+					if(StringUtils.equals(e.getIsSend(), SendMsgFlagEnum.FALSE.getValue())){
+						flag = false;
+					}
+				}
+				return flag;
+			}).map(ProjectTaskInventoryDetailEO::getUserId).distinct().collect(Collectors.toList());
+			if(CollectionUtils.isNotEmpty(sendUserIdList)){
+				sendMessage(taskInventoryDetail,sendUserIdList);
+			}
 		}
 		if(CollectionUtils.isNotEmpty(projectTaskInventoryDetailEOUpdateList)){
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
index 399267b15..5322c1377 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
@@ -696,7 +696,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 
 		FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
 		if (StringUtils.equals(msgType, MsgTypeEnum.DESIGN_ISSUE_DRE_MSG.getValue())) {
-			taskKey = "dreDispose";
+			taskKey = DesignComplianceNodeEnum.DRE_DISPOSE.getKey();
 
 			msgContentEN = sysUser.getUsername() + "has assigned the design compliance confirmation process of " + serialNumber + " in "
 					+ projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/DesignComplianceNodeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/DesignComplianceNodeEnum.java
index 9865b861d..f79868e9e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/DesignComplianceNodeEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/DesignComplianceNodeEnum.java
@@ -12,6 +12,8 @@ public enum DesignComplianceNodeEnum {
     INITIATE_PROCESS("fqlc","发起流程","Initiate process"),
     THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK("zrrclrw","责任人处理任务","The responsible person handles the task"),
     SPONSOR_REVIEW("fqrsh","发起人审核","Sponsor review"),
+
+    DRE_DISPOSE("dreDispose","dre处理","dreDispose"),
     ;
 
     String key;