From 54eb3d681a65c09c38c9fa37c5036595fb7b7dd5 Mon Sep 17 00:00:00 2001
From: CD <1103614279@qq.com>
Date: Wed, 2 Nov 2022 15:57:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=82=AC=E5=8A=9E(excel?=
 =?UTF-8?q?=E4=B8=AD=E6=B2=A1=E6=9C=89=EF=BC=8C=E4=BD=86=E6=98=AF=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E8=AE=A9=E5=8A=A0=E4=B8=8A)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java    | 68 +++++++++++++------
 1 file changed, 48 insertions(+), 20 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index e2956e7ae..f492b4be3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -8596,7 +8596,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		projectLawsInventoryEOList.forEach(projectLawsInventoryEO -> {
 
 			//如果清单确认状态为待确认的，进行催办
-			/*if(StringUtils.equals(projectLawsInventoryEO.getInventoryAffirmStatus(),InventoryAffirmStatusEnum.LIST_TO_CONFIRM.getValue())){
+			if(StringUtils.equals(projectLawsInventoryEO.getInventoryAffirmStatus(),InventoryAffirmStatusEnum.LIST_TO_CONFIRM.getValue())){
 				List<String> inventoryAffirmUserIdList = new ArrayList<>();
 
 				if(StringUtils.isEmpty(projectLawsInventoryEO.getHomologationEngineerSubmitStatus())){
@@ -8624,14 +8624,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOMapper.selectOne(projectYearInfoEOQueryWrapper);
 
 					//消息内容
-					String msgContentEN = "Please address the regulation list confirmation process for "+ projectNameInfoEO.getProjectName() +" ASAP. ";
-					String msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
-							+ ": You have a regulation task confirmation to complete";
+					//String msgContentEN = "Please address the regulation list confirmation process for "+ projectNameInfoEO.getProjectName() +" ASAP. ";
+					//String msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					//		+ ": You have a regulation task confirmation to complete";
 
-					FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
-					feishuMsgVo.setContent("Hello! Please address the regulation list confirmation process ASAP. ");
-					feishuMsgVo.setTaskType("Regulation List Confirmation");
-					feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
+					//FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
+					//feishuMsgVo.setContent("Hello! Please address the regulation list confirmation process ASAP. ");
+					//feishuMsgVo.setTaskType("Regulation List Confirmation");
+					//feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
 
 							//飞书跳转链接
 					String hrefFeishu = backUrl
@@ -8642,21 +8642,49 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 							+ projectYearNameInfoEO.getYearName()
 							+ "&targetMarket=" + projectLibraryBase.getTargetMarket();
 					//系统内部跳转链接
-					String href = "<a href='"
-							+ JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + projectLibraryId + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType()
-							+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
-							+ projectYearNameInfoEO.getYearName()
-							+ "&targetMarket=" + projectLibraryBase.getTargetMarket()
-							+ "'>" + " View details" + "</a>";
-					String contentInfo = msgContentEN + " " + href;
-					Map<String,Object> sendMessageMap = new HashMap<>();
-					sendMessageMap.put("hrefFeishu",hrefFeishu);
-					sendMessageMap.put("contentInfo",contentInfo);
+					//String href = "<a href='"
+					//		+ JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + projectLibraryId + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType()
+					//		+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
+					//		+ projectYearNameInfoEO.getYearName()
+					//		+ "&targetMarket=" + projectLibraryBase.getTargetMarket()
+					//		+ "'>" + " View details" + "</a>";
+					//String contentInfo = msgContentEN + " " + href;
+					//Map<String,Object> sendMessageMap = new HashMap<>();
+					//sendMessageMap.put("hrefFeishu",hrefFeishu);
+					//sendMessageMap.put("contentInfo",contentInfo);
 
 					//发送消息
-					sendMessage(msgTitle, msgContentEN,inventoryAffirmUserIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.LIST_CONFIRMATION,studioUserInfo.getUsername());
+					//sendMessage(msgTitle, msgContentEN,inventoryAffirmUserIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.LIST_CONFIRMATION,studioUserInfo.getUsername());
+
+					String projectVersion = (com.jero.modules.system.util.StringUtils.isBlank(projectLibraryBase.getParentId()) && com.jero.modules.system.util.StringUtils.isBlank(projectLibraryBase.getProjectVersion())) ? "00" : projectLibraryBase.getProjectVersion();
+					String PRN = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + "-" + projectLibraryBase.getTargetMarket() + "-" + projectVersion;
+
+					String dueDate = new SimpleDateFormat("yyyy-MM-dd").format(projectLawsInventoryEO.getInventoryAffirmDueDate());
+
+					List<String> thirdIdList = new ArrayList<>();
+					List<SysUser> sysUsers = sysUserService.listByIds(inventoryAffirmUserIdList);
+					if (ObjectUtils.isNotEmpty(sysUsers)) {
+						thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList());
+					}
+					try {
+						FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+						feishuMsgVo.setTitle(MessageType2Enum.REGULATION_LIST_CONFIRMATION.getCn() + "/" + MessageType2Enum.REGULATION_LIST_CONFIRMATION.getEn());
+						feishuMsgVo.setCnContentUpper("您好，请尽快查看处理此项任务，谢谢！");
+						feishuMsgVo.setCnContentLower("项目: " + PRN +
+								"\n发起人: 系统通知" +
+								"\n截止时间: " + dueDate);
+						feishuMsgVo.setEnContentUpper("Hello! Please check and address the task ASAP. Thank you!");
+						feishuMsgVo.setEnContentLower("Project: " + PRN +
+								"\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName() +
+								"\nDue Date: "+ dueDate);
+						feishuMsgVo.setUrl(hrefFeishu);
+						feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
+						feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
+					} catch (IOException e) {
+						log.error("飞书消息推送失败");
+					}
 				}
-			}*/
+			}
 
 			//如果任务确认状态为待确认的，进行催办
 			if(StringUtils.equals(projectLawsInventoryEO.getTaskAffirmStatus(),TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue())){