From 41d1e362615e785da1e1bf1006855adb6b046a57 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 20 Jun 2022 18:13:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF=EF=BC=8C?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E8=87=B3=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=EF=BC=8C=E5=B8=A6=E5=8F=82=E6=95=B0=20projectName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/job/InventoryAffirmJob.java | 13 ++++++++-- .../jero/modules/project/job/PrehomoJob.java | 14 +++++++++-- .../project/job/VerifyComplianceJob.java | 14 +++++++++-- .../project/job/designComplianceJob.java | 14 +++++++++-- .../ProjectLawsInventoryEOServiceImpl.java | 24 +++++++++++++------ ...ojectTaskInventoryDetailEOServiceImpl.java | 7 +++++- .../ProjectTaskInventoryEOServiceImpl.java | 13 ++++++++-- 7 files changed, 81 insertions(+), 18 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java index 973a8c568..9c9a0ca27 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java @@ -130,10 +130,14 @@ public class InventoryAffirmJob implements Job { + " are 3 days. Please check and handle it in time."; //飞书跳转链接 - String hrefFeishu = backUrl + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType(); + String hrefFeishu = backUrl + + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + + projectLibraryBase.getId() + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType() + + "&projectName=" + projectNameInfoEO.getProjectName(); //系统内部跳转链接 String href = "" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); @@ -153,10 +157,15 @@ public class InventoryAffirmJob implements Job { + " will expire today. Please check and address it in a timely manner."; //飞书跳转链接 - String hrefFeishu = backUrl + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType(); + String hrefFeishu = backUrl + + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + + projectLibraryBase.getId() + + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType() + + "&projectName=" + projectNameInfoEO.getProjectName(); //系统内部跳转链接 String href = "" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); 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 f5489d989..d2796f84c 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 @@ -136,10 +136,15 @@ public class PrehomoJob implements Job { + " are 3 days. Please check and handle it in time."; //飞书跳转链接 - String hrefFeishu = backUrl + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType(); + String hrefFeishu = backUrl + + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + + projectLibraryBase.getId() + + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType() + + "&projectName=" + projectNameInfoEO.getProjectName(); //系统内部跳转链接 String href = "" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); @@ -160,10 +165,15 @@ public class PrehomoJob implements Job { + " will expire today. Please check and address it in time."; //飞书跳转链接 - String hrefFeishu = backUrl + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType(); + String hrefFeishu = backUrl + + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + + projectLibraryBase.getId() + + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType() + + "&projectName=" + projectNameInfoEO.getProjectName(); //系统内部跳转链接 String href = "" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java index 32a1ea3b8..a01ad12f1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java @@ -135,10 +135,15 @@ public class VerifyComplianceJob implements Job { + " are 3 days. Please check and handle it in time."; //飞书跳转链接 - String hrefFeishu = backUrl + JumpLinkEnum.VERIFY_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.VERIFY_AFFIRM_LINK.getType(); + String hrefFeishu = backUrl + + JumpLinkEnum.VERIFY_AFFIRM_LINK.getLink() + + projectLibraryBase.getId() + + JumpLinkEnum.VERIFY_AFFIRM_LINK.getType() + + "&projectName=" + projectNameInfoEO.getProjectName(); //系统内部跳转链接 String href = "" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); @@ -159,10 +164,15 @@ public class VerifyComplianceJob implements Job { + " will expire today. Please check and address it in time."; //飞书跳转链接 - String hrefFeishu = backUrl + JumpLinkEnum.VERIFY_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.VERIFY_AFFIRM_LINK.getType(); + String hrefFeishu = backUrl + + JumpLinkEnum.VERIFY_AFFIRM_LINK.getLink() + + projectLibraryBase.getId() + + JumpLinkEnum.VERIFY_AFFIRM_LINK.getType() + + "&projectName=" + projectNameInfoEO.getProjectName(); //系统内部跳转链接 String href = "" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java index d50c58f77..78b5e8d8a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java @@ -133,10 +133,15 @@ public class designComplianceJob implements Job { + " are 3 days. Please check and address it in a timely manner."; //飞书跳转链接 - String hrefFeishu = backUrl + JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType(); + String hrefFeishu = backUrl + + JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + + projectLibraryBase.getId() + + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType() + + "&projectName=" + projectNameInfoEO.getProjectName(); //系统内部跳转链接 String href = "" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); @@ -156,10 +161,15 @@ public class designComplianceJob implements Job { + " will expire today. Please check and address it in time."; //飞书跳转链接 - String hrefFeishu = backUrl + JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType(); + String hrefFeishu = backUrl + + JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + + projectLibraryBase.getId() + + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType() + + "&projectName=" + projectNameInfoEO.getProjectName(); //系统内部跳转链接 String href = "" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); 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 3065a6c35..cbc31ba28 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 @@ -1102,11 +1102,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl" + "Jump link" + ""; + + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + projectLibraryId + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType() + + "&projectName=" + projectNameInfoEO.getProjectName() + + "'>" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); sendMessageMap.put("hrefFeishu",hrefFeishu); @@ -1624,7 +1628,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; @@ -5775,11 +5781,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl" + "Jump link" + ""; + + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + projectLibraryId + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType() + + "&projectName=" + projectNameInfoEO.getProjectName() + + "'>" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); sendMessageMap.put("hrefFeishu",hrefFeishu); 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 739462ef9..e7ad07806 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 @@ -276,10 +276,15 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); 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 9c0a9d0c5..541f5ad94 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 @@ -328,10 +328,14 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); @@ -611,10 +615,15 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>();