From eab008751badaea24caf10d78b1a371c9bfb2b2c Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Fri, 2 Sep 2022 17:40:47 +0800
Subject: [PATCH] =?UTF-8?q?59159=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LawsOpinionGatherEOServiceImpl.java     | 12 +++++++++++-
 .../LawsTechnologyEvaluationEOServiceImpl.java   | 16 +++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java
index 4f2fa5230..704755bfe 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java
@@ -235,11 +235,17 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGathe
 
 		String msgContentEN  = "";
 		String msgTitle = "";
+		String initiator = "";
 		if(StringUtils.equals(msgType,MsgTypeEnum.LAWS_OPOMOPM_GATHER_START_MSG.getValue())){
 			userIdList.addAll(Arrays.asList(jsonObject.getString("evaluatorIds").split(",")));
 			String endTime = jsonObject.getString("endTime"); //截止日期
 			msgContentEN  = "You recieved the Collection of Legislative Comments of "+serialNumber+" . The due date is "+endTime+". Please check and address it in a timely manner.";
 			msgTitle = "You have a Collection of Legislative Comments task to complete";
+
+			String currentUserId = jsonObject.getString("currentUserId"); //当前操作用户id
+			SysUser currentUser = sysUserService.getBaseMapper().selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, currentUserId));
+
+			initiator = currentUser.getUsername();
 		}else if(StringUtils.equals(msgType,MsgTypeEnum.LAWS_OPOMOPM_GATHER_ENALUATOR_SUBMIT_MSG.getValue())){
 			String currentUserId = jsonObject.getString("currentUserId"); //当前操作用户id
 			SysUser currentUser = sysUserService.getBaseMapper().selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, currentUserId));
@@ -247,10 +253,14 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGathe
 			userIdList.add(jsonObject.getString("initiatorUserId"));
 			msgContentEN  = currentUser.getUsername() + " has submitted the collection process of Collection of Legislative Comments of "+serialNumber+", please check it in time.";
 			msgTitle = "You have a Collection of Legislative Comments task completed";
+
+			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 		}else if(StringUtils.equals(msgType, MsgTypeEnum.LAWS_OPOMOPM_GATHER_ENALUATOR_EXPIRE_REMIND_MSG.getValue())){
 			userIdList = (List<String>) jsonObject.get("userIdList");
 			msgContentEN  = "The the Collection of Legislative Comments of "+serialNumber+" will expire  tomorrow . Please check and address it in time.";
 			msgTitle = "You have a Collection of Legislative Comments task completed";
+
+			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 		}
 
 		//飞书跳转链接
@@ -263,6 +273,6 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGathe
 		sendMessageMap.put("hrefFeishu",hrefFeishu);
 		sendMessageMap.put("contentInfo",contentInfo);
 
-		SendMessageUtils.sendMessage(msgTitle,msgContentEN,userIdList,lawsOpinionGatherId,sendMessageMap,null,MessageTypeEnum.COLLECTION_OF_LEGISLATIVE_COMMENTS,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
+		SendMessageUtils.sendMessage(msgTitle,msgContentEN,userIdList,lawsOpinionGatherId,sendMessageMap,null,MessageTypeEnum.COLLECTION_OF_LEGISLATIVE_COMMENTS,initiator);
 	}
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
index 03c9c46f8..f3a16a003 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
@@ -550,12 +550,18 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 
 		String msgContentEN  = "";
 		String msgTitle = "";
+		String initiator = "";
 		if(StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_START_MSG.getValue())){
 			userIdList.add(jsonObject.getString("evaluationId"));
 			String endTime = jsonObject.getString("endTime"); //截止日期
 			//您收到GB 7258 的法规技术评估流程任务，请及时查看处理。
 			msgContentEN  = "You recieved the Regulatory and technical assessment of "+serialNumber+" . The due date is "+endTime+". Please check and address it in a timely manner.";
 			msgTitle = "You have a Regulatory and technical assessment task to complete";
+
+			String currentUserId = jsonObject.getString("currentUserId"); //当前操作用户id
+			SysUser currentUser = sysUserService.getBaseMapper().selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, currentUserId));
+
+			initiator = currentUser.getUsername();
 		}else if(StringUtils.equals(msgType,MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_ENALUATOR_SUBMIT_MSG.getValue())){
 			String currentUserId = jsonObject.getString("currentUserId"); //当前操作用户id
 			SysUser currentUser = this.sysUserService.getBaseMapper().selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, currentUserId));
@@ -564,21 +570,29 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 			//XXX（人员账号）已提交GB 7258 的法规意见收集流程，请及时查看审核。
 			msgContentEN  = currentUser.getUsername() + " has submitted the collection process of Regulatory and technical assessment of "+serialNumber+", Please check and address it in time.";
 			msgTitle = "You have a Regulatory and technical assessment task to complete";
+
+			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 		}else if(StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_AUDIT_ACCEPTED_MSG.getValue())){
 			userIdList.add(jsonObject.getString("evaluationId"));
 			//您提交的GB 7258 的法规技术评估流程已通过。
 			msgContentEN  = "The regulatory and technical assessment process for "+serialNumber+" you submitted has passed.";
 			msgTitle = "You have a Regulatory and technical assessment task completed";
+
+			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 		}else if(StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_AUDIT_REJECTED_MSG.getValue())){
 			userIdList.add(jsonObject.getString("evaluationId"));
 			//您提交的GB 7258 的法规技术评估流程已被退回，请及时查看处理。
 			msgContentEN  = "The regulatory and technical assessment process of "+serialNumber+" you submitted has been returned, Please check and address it in time.";
 			msgTitle = "You have a Regulatory and technical assessment task to complete";
+
+			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 		}else if(StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_EXPIRE_REMIND_MSG.getValue())){
 			userIdList = (List<String>) jsonObject.get("userIdList");
 			//您GB 7258的法规技术评估流程将于明天结束，请及时查看处理
 			msgContentEN  = "The the Regulatory and technical assessment of "+serialNumber+" will expire tomorrow. Please check and address it in time.";
 			msgTitle = "You have a Regulatory and technical assessment task to complete";
+
+			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 		}
 
 		//飞书跳转链接
@@ -591,7 +605,7 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 		sendMessageMap.put("hrefFeishu",hrefFeishu);
 		sendMessageMap.put("contentInfo",contentInfo);
 
-		SendMessageUtils.sendMessage(msgTitle,msgContentEN,userIdList,lawsTechnologyEvaluationId,sendMessageMap,null, MessageTypeEnum.REGULATORY_AND_TECHNICAL_ASSESSMENT,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
+		SendMessageUtils.sendMessage(msgTitle,msgContentEN,userIdList,lawsTechnologyEvaluationId,sendMessageMap,null, MessageTypeEnum.REGULATORY_AND_TECHNICAL_ASSESSMENT,initiator);
 	}
 
 	private String getTreeName(String cut, List<SysCategory> categoryList, List<String> technologyTerritoryList) {