From e035f46fda61bd3489e609fb7b59226184f1580f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Mon, 9 Oct 2023 14:26:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E5=8F=91=E6=B6=88=E6=81=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/project/job/PrehomoJob.java  |  4 +-
 ...ojectTaskInventoryDetailEOServiceImpl.java | 26 ++++-----
 .../ProjectTaskInventoryEOServiceImpl.java    | 54 +++++++++----------
 ...ectTaskInventoryFeedbackEOServiceImpl.java | 52 +++++++++---------
 4 files changed, 69 insertions(+), 67 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java
index 04736c68e..2c0a4ac94 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java
@@ -73,7 +73,7 @@ public class PrehomoJob implements Job {
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
         log.info("prehomo流程，定时任务开启 =====================================================");
-
+/*
         //查询出已经启动了prehomo流程的数据。 并且流程没有结束。
         QueryWrapper<ProjectTaskInventoryEO> queryProjectTaskInventoryWrapper = new QueryWrapper<>();
         queryProjectTaskInventoryWrapper.isNotNull("prehomo_p_id");
@@ -367,5 +367,7 @@ public class PrehomoJob implements Job {
             }
         }
         log.info("prehomo流程，定时任务结束 =====================================================");
+
+ */
     }
 }
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 6be203fab..582a40d6c 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
@@ -543,19 +543,19 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 			if(CollectionUtils.isNotEmpty(sysUsers)){
 				thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList());
 			}
-			try {
-				FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
-				feishuMsgVo.setTitle(msgTitle);
-				feishuMsgVo.setCnContentUpper(cnContentUpper);
-				feishuMsgVo.setCnContentLower(cnContentLower);
-				feishuMsgVo.setEnContentUpper(enContentUpper);
-				feishuMsgVo.setEnContentLower(enContentLower);
-				feishuMsgVo.setUrl(hrefFeishu);
-				feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
-				feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
-			} catch (IOException e) {
-				log.error("飞书消息推送失败");
-			}
+//			try {
+//				FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+//				feishuMsgVo.setTitle(msgTitle);
+//				feishuMsgVo.setCnContentUpper(cnContentUpper);
+//				feishuMsgVo.setCnContentLower(cnContentLower);
+//				feishuMsgVo.setEnContentUpper(enContentUpper);
+//				feishuMsgVo.setEnContentLower(enContentLower);
+//				feishuMsgVo.setUrl(hrefFeishu);
+//				feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
+////				feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
+//			} catch (IOException e) {
+//				log.error("飞书消息推送失败");
+//			}
 		}
 	}
 }
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 3ef531cac..d7437e8fc 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
@@ -800,22 +800,22 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 			if(CollectionUtils.isNotEmpty(sysUsers)){
 				thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList());
 			}
-			try {
-				FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
-				feishuMsgVo.setTitle(msgTitle);
-				feishuMsgVo.setCnContentUpper(cnContentUpper);
-				feishuMsgVo.setCnContentLower(cnContentLower);
-				feishuMsgVo.setEnContentUpper(enContentUpper);
-				feishuMsgVo.setEnContentLower(enContentLower);
-				feishuMsgVo.setUrl(hrefFeishu);
-				feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
-				feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
-			} catch (IOException e) {
-				log.error("飞书消息推送失败");
-			}
+//
 			//系统内部跳转链接
 			//String href = "<a href='"
-			//		+ JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType()
+			//		+ JumpLinkEnum.INVENTORtry {
+			////				FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+			////				feishuMsgVo.setTitle(msgTitle);
+			////				feishuMsgVo.setCnContentUpper(cnContentUpper);
+			////				feishuMsgVo.setCnContentLower(cnContentLower);
+			////				feishuMsgVo.setEnContentUpper(enContentUpper);
+			////				feishuMsgVo.setEnContentLower(enContentLower);
+			////				feishuMsgVo.setUrl(hrefFeishu);
+			////				feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
+			//////				feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
+			////			} catch (IOException e) {
+			////				log.error("飞书消息推送失败");
+			////			}Y_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType()
 			//		+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
 			//		+ projectYearNameInfoEO.getYearName()
 			//		+ "&targetMarket=" + projectLibraryBase.getTargetMarket()
@@ -1510,19 +1510,19 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 			if(CollectionUtils.isNotEmpty(sysUsers)){
 				thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList());
 			}
-			try {
-				FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
-				feishuMsgVo.setTitle(msgTitle);
-				feishuMsgVo.setCnContentUpper(cnContentUpper);
-				feishuMsgVo.setCnContentLower(cnContentLower);
-				feishuMsgVo.setEnContentUpper(enContentUpper);
-				feishuMsgVo.setEnContentLower(enContentLower);
-				feishuMsgVo.setUrl(hrefFeishu);
-				feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
-				feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
-			} catch (IOException e) {
-				log.error("飞书消息推送失败");
-			}
+//			try {
+//				FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+//				feishuMsgVo.setTitle(msgTitle);
+//				feishuMsgVo.setCnContentUpper(cnContentUpper);
+//				feishuMsgVo.setCnContentLower(cnContentLower);
+//				feishuMsgVo.setEnContentUpper(enContentUpper);
+//				feishuMsgVo.setEnContentLower(enContentLower);
+//				feishuMsgVo.setUrl(hrefFeishu);
+//				feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
+////				feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
+//			} catch (IOException e) {
+//				log.error("飞书消息推送失败");
+//			}
 			//系统内部跳转链接
 			//String href = "<a href='"
 			//		+ JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType()
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java
index 726fdca56..d426afc92 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java
@@ -290,19 +290,19 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 				if(CollectionUtils.isNotEmpty(sysUsers)){
 					thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList());
 				}
-				try {
-					FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
-					feishuMsgVo.setTitle(msgTitle);
-					feishuMsgVo.setCnContentUpper(cnContentUpper);
-					feishuMsgVo.setCnContentLower(cnContentLower);
-					feishuMsgVo.setEnContentUpper(enContentUpper);
-					feishuMsgVo.setEnContentLower(enContentLower);
-					feishuMsgVo.setUrl(hrefFeishu);
-					feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
-					feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
-				} catch (IOException e) {
-					log.error("飞书消息推送失败");
-				}
+//				try {
+//					FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+//					feishuMsgVo.setTitle(msgTitle);
+//					feishuMsgVo.setCnContentUpper(cnContentUpper);
+//					feishuMsgVo.setCnContentLower(cnContentLower);
+//					feishuMsgVo.setEnContentUpper(enContentUpper);
+//					feishuMsgVo.setEnContentLower(enContentLower);
+//					feishuMsgVo.setUrl(hrefFeishu);
+//					feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
+////					feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
+//				} catch (IOException e) {
+//					log.error("飞书消息推送失败");
+//				}
 				//系统内部跳转链接
 				//String href = "<a href='"
 				//		+ JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + projectLibraryBaseInfo.getId() + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType()
@@ -610,19 +610,19 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 				if(CollectionUtils.isNotEmpty(sysUsers)){
 					thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList());
 				}
-				try {
-					FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
-					feishuMsgVo.setTitle(msgTitle);
-					feishuMsgVo.setCnContentUpper(cnContentUpper);
-					feishuMsgVo.setCnContentLower(cnContentLower);
-					feishuMsgVo.setEnContentUpper(enContentUpper);
-					feishuMsgVo.setEnContentLower(enContentLower);
-					feishuMsgVo.setUrl(hrefFeishu);
-					feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
-					feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
-				} catch (IOException e) {
-					log.error("飞书消息推送失败");
-				}
+//				try {
+//					FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+//					feishuMsgVo.setTitle(msgTitle);
+//					feishuMsgVo.setCnContentUpper(cnContentUpper);
+//					feishuMsgVo.setCnContentLower(cnContentLower);
+//					feishuMsgVo.setEnContentUpper(enContentUpper);
+//					feishuMsgVo.setEnContentLower(enContentLower);
+//					feishuMsgVo.setUrl(hrefFeishu);
+//					feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
+////					feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
+//				} catch (IOException e) {
+//					log.error("飞书消息推送失败");
+//				}
 				//系统内部跳转链接
 				//String href = "<a href='"
 				//		+ JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + projectLibraryBaseInfo.getId() + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType()