From 739dcf875ecc2969df4ddaa136322a1f3cf94e01 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Fri, 14 Apr 2023 17:45:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E4=BB=BB=E5=8A=A1=E3=80=82?= =?UTF-8?q?=E9=A3=9E=E4=B9=A6=E8=B7=B3=E8=BD=AC=E5=BE=85=E5=8A=9E=E4=B8=AD?= =?UTF-8?q?=E5=BF=83-=E5=A4=84=E7=90=86=E9=A1=B9=E7=9B=AE=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/project/job/TaskAffirmJob.java | 18 +++++--- .../project/job/VerifyComplianceJob.java | 12 ++++-- .../project/job/designComplianceJob.java | 12 ++++-- .../ProjectLawsInventoryEOServiceImpl.java | 43 +++++++++++++------ 4 files changed, 57 insertions(+), 28 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java index 1e5061ebd..48ccf0143 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java @@ -137,11 +137,12 @@ public class TaskAffirmJob implements Job { params.put("flowTypeEn","Design Compliance Process"); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取待办中心 - 飞书跳转链接 Map todoCenterParams = new HashMap<>(); todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); @@ -174,11 +175,12 @@ public class TaskAffirmJob implements Job { params.put("flowTypeEn","Design Compliance Process"); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取待办中心 - 飞书跳转链接 Map todoCenterParams = new HashMap<>(); todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); @@ -211,11 +213,12 @@ public class TaskAffirmJob implements Job { params.put("flowTypeEn","Design Compliance Process"); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取待办中心 - 飞书跳转链接 Map todoCenterParams = new HashMap<>(); todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); @@ -263,11 +266,12 @@ public class TaskAffirmJob implements Job { params.put("flowTypeEn","Validation Compliance Process"); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取待办中心 - 飞书跳转链接 Map todoCenterParams = new HashMap<>(); todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); @@ -300,11 +304,12 @@ public class TaskAffirmJob implements Job { params.put("flowTypeEn","Validation Compliance Process"); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取待办中心 - 飞书跳转链接 Map todoCenterParams = new HashMap<>(); todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); @@ -337,11 +342,12 @@ public class TaskAffirmJob implements Job { params.put("flowTypeEn","Validation Compliance Process"); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取待办中心 - 飞书跳转链接 Map todoCenterParams = new HashMap<>(); todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); 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 640040642..042057226 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 @@ -126,11 +126,12 @@ public class VerifyComplianceJob implements Job { params.put("serialNumbers",serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取待办中心 - 飞书跳转链接 Map todoCenterParams = new HashMap<>(); todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); @@ -162,11 +163,12 @@ public class VerifyComplianceJob implements Job { params.put("serialNumbers",serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取待办中心 - 飞书跳转链接 Map todoCenterParams = new HashMap<>(); todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); @@ -198,11 +200,12 @@ public class VerifyComplianceJob implements Job { params.put("serialNumbers",serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取待办中心 - 飞书跳转链接 Map todoCenterParams = new HashMap<>(); todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); @@ -233,11 +236,12 @@ public class VerifyComplianceJob implements Job { params.put("serialNumbers",serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取待办中心 - 飞书跳转链接 Map todoCenterParams = new HashMap<>(); todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); 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 bb5a24ae4..d36ffc901 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 @@ -126,11 +126,12 @@ public class designComplianceJob implements Job { params.put("serialNumbers",serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取待办中心 - 飞书跳转链接 Map todoCenterParams = new HashMap<>(); todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); @@ -162,11 +163,12 @@ public class designComplianceJob implements Job { params.put("serialNumbers",serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取待办中心 - 飞书跳转链接 Map todoCenterParams = new HashMap<>(); todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); @@ -198,11 +200,12 @@ public class designComplianceJob implements Job { params.put("serialNumbers",serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取待办中心 - 飞书跳转链接 Map todoCenterParams = new HashMap<>(); todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); @@ -233,11 +236,12 @@ public class designComplianceJob implements Job { params.put("serialNumbers",serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取待办中心 - 飞书跳转链接 Map todoCenterParams = new HashMap<>(); todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); 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 1eb67e624..fe0f63337 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 @@ -790,11 +790,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); @@ -890,11 +891,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); @@ -923,11 +925,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); @@ -963,11 +966,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); @@ -1002,11 +1006,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); @@ -1045,11 +1050,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); @@ -1082,11 +1088,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); @@ -3472,11 +3479,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); prarams.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); prarams.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); @@ -10262,11 +10270,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); @@ -10328,6 +10337,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryId, todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); @@ -10390,6 +10400,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); @@ -10501,11 +10512,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); @@ -10567,6 +10579,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryId, todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); @@ -10629,6 +10642,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); todoCenterParams.put("projectNameCn",PRN_CN); + todoCenterParams.put("projectNameEn",PRN_EN); Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); @@ -11665,10 +11679,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl getToDoCenterLinkHrefFeishu(String projectLibraryId, Map todoCenterParams) { - // String projectNameCn = (String) todoCenterParams.get("projectNameCn"); + String projectNameCn = (String) todoCenterParams.get("projectNameCn"); + String projectNameEn = (String) todoCenterParams.get("projectNameEn"); - ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.getBaseMapper().selectProjectName(projectLibraryId); - String projectNameCn = projectLibraryBase.getProjectName(); +// ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.getBaseMapper().selectProjectName(projectLibraryId); +// String projectNameCn = projectLibraryBase.getProjectName(); Map result = new HashMap<>(); @@ -11677,7 +11692,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl