法规流程-飞书消息跳转问题。

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java

@@ -20,6 +20,7 @@ public enum JumpLinkEnum {
     DESIGN_AFFIRM_LINK("设计符合性确认链接","4","/ProjectDetails?id=","&type=103"),
     CERTIFICATION_INVENTORY_LINK("认证清单链接","5","/ProjectDetails?id=","&type=106"),
     TASK_AFFIRM_LINK("任务确认链接","2","/ProcessCenter",""),
+    FGRW_TO_DO_CENTER_LINK("项目法规任务待办中心链接","2","/projectRegulationTasks",""),
     FGPG_TODO_CENTER_LINK("法规评估任务待办中心链接","88","/regulatoryAssessmentTasks",""),
     XMCS_TODO_CENTER_LINK("项目参数任务待办中心链接","99","/projectParameterTasks",""),
     COMPLIANCE_PROCESS_DETAIL_LINK("符合性流程明细页路由","2","/taskListProcess",""),

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java

@@ -21,6 +21,7 @@ import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
 import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
 import com.jero.modules.project.mapper.ProjectYearNameInfoEOMapper;
 import com.jero.modules.project.service.IProjectLawsInventoryEOService;
+import com.jero.modules.project.service.IProjectLibraryBaseService;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
 import lombok.extern.slf4j.Slf4j;
@@ -69,6 +70,8 @@ public class InventoryAffirmJob implements Job {
     private ISysUserService sysUserService;
     @Autowired
     private IBussDocumentLibraryEOService bussDocumentLibraryEOService;
+    @Autowired
+    private IProjectLibraryBaseService projectLibraryBaseService;
 
     private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -124,6 +127,15 @@ public class InventoryAffirmJob implements Job {
                         params.put("endTime",endTime);
                         params.put("userIdList",userIdList);
                         params.put("serialNumbers",serialNumbers);
+
+                        ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+                        String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+                        // 获取法规清单 - 飞书跳转链接
+                        Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN);
+                        params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
+                        params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE4.getValue(),params);
                     }
                     // 当天结束的
@@ -143,6 +155,15 @@ public class InventoryAffirmJob implements Job {
                         params.put("endTime",endTime);
                         params.put("userIdList",userIdList);
                         params.put("serialNumbers",serialNumbers);
+
+                        ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+                        String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+                        // 获取法规清单 - 飞书跳转链接
+                        Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN);
+                        params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
+                        params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE4.getValue(),params);
                     }
                     // 逾期的
@@ -162,6 +183,15 @@ public class InventoryAffirmJob implements Job {
                         params.put("endTime",endTime);
                         params.put("userIdList",userIdList);
                         params.put("serialNumbers",serialNumbers);
+
+                        ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+                        String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+                        // 获取法规清单 - 飞书跳转链接
+                        Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN);
+                        params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
+                        params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE4.getValue(),params);
                     }
                 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java

@@ -22,6 +22,7 @@ import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
 import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
 import com.jero.modules.project.mapper.ProjectYearNameInfoEOMapper;
 import com.jero.modules.project.service.IProjectLawsInventoryEOService;
+import com.jero.modules.project.service.IProjectLibraryBaseService;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.wkflow.enums.FlowTypeEnum;
@@ -69,6 +70,9 @@ public class TaskAffirmJob implements Job {
     @Autowired
     private IProjectLawsInventoryEOService projectLawsInventoryEOService;
 
+    @Autowired
+    private IProjectLibraryBaseService projectLibraryBaseService;
+
     private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
 
@@ -131,6 +135,17 @@ public class TaskAffirmJob implements Job {
                         params.put("serialNumbers",serialNumbers);
                         params.put("flowTypeCn","设计符合性流程");
                         params.put("flowTypeEn","Design Compliance Process");
+
+                        ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+                        String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+                        // 获取待办中心 - 飞书跳转链接
+                        Map<String,Object> todoCenterParams = new HashMap<>();
+                        todoCenterParams.put("projectNameCn",PRN_CN);
+                        Map<String, Object> 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"));
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params);
                     }
                     // 当天结束的
@@ -152,6 +167,17 @@ public class TaskAffirmJob implements Job {
                         params.put("serialNumbers",serialNumbers);
                         params.put("flowTypeCn","设计符合性流程");
                         params.put("flowTypeEn","Design Compliance Process");
+
+                        ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+                        String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+                        // 获取待办中心 - 飞书跳转链接
+                        Map<String,Object> todoCenterParams = new HashMap<>();
+                        todoCenterParams.put("projectNameCn",PRN_CN);
+                        Map<String, Object> 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"));
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params);
                     }
                     // 逾期的
@@ -173,6 +199,17 @@ public class TaskAffirmJob implements Job {
                         params.put("serialNumbers",serialNumbers);
                         params.put("flowTypeCn","设计符合性流程");
                         params.put("flowTypeEn","Design Compliance Process");
+
+                        ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+                        String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+                        // 获取待办中心 - 飞书跳转链接
+                        Map<String,Object> todoCenterParams = new HashMap<>();
+                        todoCenterParams.put("projectNameCn",PRN_CN);
+                        Map<String, Object> 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"));
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION5.getValue(),params);
                     }
                 }
@@ -209,6 +246,17 @@ public class TaskAffirmJob implements Job {
                         params.put("serialNumbers",serialNumbers);
                         params.put("flowTypeCn","验证符合性流程");
                         params.put("flowTypeEn","Validation Compliance Process");
+
+                        ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+                        String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+                        // 获取待办中心 - 飞书跳转链接
+                        Map<String,Object> todoCenterParams = new HashMap<>();
+                        todoCenterParams.put("projectNameCn",PRN_CN);
+                        Map<String, Object> 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"));
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params);
                     }
                     // 当天结束的
@@ -230,6 +278,17 @@ public class TaskAffirmJob implements Job {
                         params.put("serialNumbers",serialNumbers);
                         params.put("flowTypeCn","验证符合性流程");
                         params.put("flowTypeEn","Validation Compliance Process");
+
+                        ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+                        String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+                        // 获取待办中心 - 飞书跳转链接
+                        Map<String,Object> todoCenterParams = new HashMap<>();
+                        todoCenterParams.put("projectNameCn",PRN_CN);
+                        Map<String, Object> 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"));
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params);
                     }
                     // 逾期的
@@ -251,6 +310,17 @@ public class TaskAffirmJob implements Job {
                         params.put("serialNumbers",serialNumbers);
                         params.put("flowTypeCn","验证符合性流程");
                         params.put("flowTypeEn","Validation Compliance Process");
+
+                        ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+                        String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+                        // 获取待办中心 - 飞书跳转链接
+                        Map<String,Object> todoCenterParams = new HashMap<>();
+                        todoCenterParams.put("projectNameCn",PRN_CN);
+                        Map<String, Object> 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"));
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION5.getValue(),params);
                     }
                 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java

@@ -21,6 +21,7 @@ import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
 import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
 import com.jero.modules.project.mapper.ProjectYearNameInfoEOMapper;
 import com.jero.modules.project.service.IProjectLawsInventoryEOService;
+import com.jero.modules.project.service.IProjectLibraryBaseService;
 import com.jero.modules.project.service.IProjectTaskInventoryEOService;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
@@ -62,6 +63,9 @@ public class VerifyComplianceJob implements Job {
     @Autowired
     private IProjectTaskInventoryEOService projectTaskInventoryEOService;
 
+    @Autowired
+    private IProjectLibraryBaseService projectLibraryBaseService;
+
     @Value(value = "${jero.backUrl}")
     private String backUrl;
 
@@ -120,6 +124,17 @@ public class VerifyComplianceJob implements Job {
                         params.put("endTime",endTime);
                         params.put("userIdList",userIdList);
                         params.put("serialNumbers",serialNumbers);
+
+                        ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+                        String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+                        // 获取待办中心 - 飞书跳转链接
+                        Map<String,Object> todoCenterParams = new HashMap<>();
+                        todoCenterParams.put("projectNameCn",PRN_CN);
+                        Map<String, Object> 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"));
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params);
                     }
 
@@ -140,6 +155,17 @@ public class VerifyComplianceJob implements Job {
                         params.put("endTime",endTime);
                         params.put("userIdList",userIdList);
                         params.put("serialNumbers",serialNumbers);
+
+                        ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+                        String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+                        // 获取待办中心 - 飞书跳转链接
+                        Map<String,Object> todoCenterParams = new HashMap<>();
+                        todoCenterParams.put("projectNameCn",PRN_CN);
+                        Map<String, Object> 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"));
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params);
                     }
 
@@ -160,6 +186,17 @@ public class VerifyComplianceJob implements Job {
                         params.put("endTime",endTime);
                         params.put("userIdList",userIdList);
                         params.put("serialNumbers",serialNumbers);
+
+                        ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+                        String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+                        // 获取待办中心 - 飞书跳转链接
+                        Map<String,Object> todoCenterParams = new HashMap<>();
+                        todoCenterParams.put("projectNameCn",PRN_CN);
+                        Map<String, Object> 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"));
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params);
                     }
                     // 逾期的
@@ -179,6 +216,17 @@ public class VerifyComplianceJob implements Job {
                         params.put("endTime",endTime);
                         params.put("userIdList",userIdList);
                         params.put("serialNumbers",serialNumbers);
+
+                        ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+                        String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+                        // 获取待办中心 - 飞书跳转链接
+                        Map<String,Object> todoCenterParams = new HashMap<>();
+                        todoCenterParams.put("projectNameCn",PRN_CN);
+                        Map<String, Object> 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"));
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION3.getValue(),params);
                     }
                 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java

@@ -21,6 +21,7 @@ import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
 import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
 import com.jero.modules.project.mapper.ProjectYearNameInfoEOMapper;
 import com.jero.modules.project.service.IProjectLawsInventoryEOService;
+import com.jero.modules.project.service.IProjectLibraryBaseService;
 import com.jero.modules.project.service.IProjectTaskInventoryEOService;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
@@ -71,6 +72,9 @@ public class designComplianceJob implements Job {
     private ISysUserService sysUserService;
     @Autowired
     private IFeishuService feishuService;
+
+    @Autowired
+    private IProjectLibraryBaseService projectLibraryBaseService;
     private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
     @Override
@@ -120,6 +124,17 @@ public class designComplianceJob implements Job {
                         params.put("endTime",endTime);
                         params.put("userIdList",userIdList);
                         params.put("serialNumbers",serialNumbers);
+
+                        ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+                        String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+                        // 获取待办中心 - 飞书跳转链接
+                        Map<String,Object> todoCenterParams = new HashMap<>();
+                        todoCenterParams.put("projectNameCn",PRN_CN);
+                        Map<String, Object> 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"));
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params);
                     }
 
@@ -140,6 +155,17 @@ public class designComplianceJob implements Job {
                         params.put("endTime",endTime);
                         params.put("userIdList",userIdList);
                         params.put("serialNumbers",serialNumbers);
+
+                        ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+                        String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+                        // 获取待办中心 - 飞书跳转链接
+                        Map<String,Object> todoCenterParams = new HashMap<>();
+                        todoCenterParams.put("projectNameCn",PRN_CN);
+                        Map<String, Object> 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"));
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params);
                     }
 
@@ -160,6 +186,17 @@ public class designComplianceJob implements Job {
                         params.put("endTime",endTime);
                         params.put("userIdList",userIdList);
                         params.put("serialNumbers",serialNumbers);
+
+                        ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+                        String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+                        // 获取待办中心 - 飞书跳转链接
+                        Map<String,Object> todoCenterParams = new HashMap<>();
+                        todoCenterParams.put("projectNameCn",PRN_CN);
+                        Map<String, Object> 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"));
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params);
                     }
                     // 逾期的
@@ -179,6 +216,17 @@ public class designComplianceJob implements Job {
                         params.put("endTime",endTime);
                         params.put("userIdList",userIdList);
                         params.put("serialNumbers",serialNumbers);
+
+                        ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+                        String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+                        // 获取待办中心 - 飞书跳转链接
+                        Map<String,Object> todoCenterParams = new HashMap<>();
+                        todoCenterParams.put("projectNameCn",PRN_CN);
+                        Map<String, Object> 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"));
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION3.getValue(),params);
                     }
                 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java

@@ -25,4 +25,5 @@ public interface ProjectLibraryBaseMapper extends BaseMapper<ProjectLibraryBase>
     /**根据id查询*/
     List<ProjectLibraryBase> queryById(String id);
 
+    ProjectLibraryBase selectProjectName(@Param("projectLibraryId") String projectLibraryId);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml

@@ -279,4 +279,15 @@
         </where>
         order by plb.create_time desc
     </select>
+
+    <select id="selectProjectName" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
+        SELECT
+            concat( pni.project_name, '-', pyni.year_name ) AS project_name
+        FROM
+            project_library_base plb
+            LEFT JOIN project_name_info pni ON plb.project_name_id = pni.id
+            LEFT JOIN project_year_name_info pyni ON plb.year_name_id = pyni.id
+        WHERE
+            plb.id = #{projectLibraryId}
+    </select>
 </mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java

@@ -209,6 +209,14 @@ public interface IProjectLawsInventoryEOService extends IService<ProjectLawsInve
 
 	Map<String, Object> getProjectLawsInventoryLinkHrefFeishu(String projectLibraryId, String PRN_CN, String PRN_EN);
 
+	/**
+	 * 获取待办中心跳转链接
+	 * @param projectLibraryId
+	 * @param todoCenterParams
+	 * @return
+	 */
+	Map<String, Object> getToDoCenterLinkHrefFeishu(String projectLibraryId, Map<String,Object> todoCenterParams);
+
 	/**
 	 * 法规清单根据清单确认截至日期顺序排序
 	 * @param projectLawsInventoryEOS

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java

@@ -668,6 +668,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("endTime",endTime);
 				params.put("userIdList",Arrays.asList(regulationOwnerId.split(",")));
 				params.put("serialNumbers",projectLawsInventoryOld.getSerialNumber());
+
+				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId());
+				// String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+				String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+				// 获取待办中心 - 飞书跳转链接
+				Map<String,Object> todoCenterParams = new HashMap<>();
+				todoCenterParams.put("projectNameCn",PRN_CN);
+				Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
+				params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
+				params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+
 				this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params);
 			}
 		}
@@ -687,6 +698,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("endTime",endTime);
 				params.put("userIdList",Arrays.asList(regulationOwnerId.split(",")));
 				params.put("serialNumbers",projectLawsInventoryOld.getSerialNumber());
+
+				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId());
+				// String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+				String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+				// 获取待办中心 - 飞书跳转链接
+				Map<String,Object> todoCenterParams = new HashMap<>();
+				todoCenterParams.put("projectNameCn",PRN_CN);
+				Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
+				params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
+				params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+
 				this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params);
 			}
 		}
@@ -706,6 +728,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("endTime",endTime);
 				params.put("userIdList",Arrays.asList(regulationOwnerId.split(",")));
 				params.put("serialNumbers",projectLawsInventoryOld.getSerialNumber());
+
+				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId());
+				// String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+				String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+				// 获取待办中心 - 飞书跳转链接
+				Map<String,Object> todoCenterParams = new HashMap<>();
+				todoCenterParams.put("projectNameCn",PRN_CN);
+				Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
+				params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
+				params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+
 				this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params);
 			}
 		}
@@ -732,6 +765,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("endTime",endTime);
 				params.put("userIdList",Arrays.asList(projectLawsInventoryOld.getDesignDutyId().split(",")));
 				params.put("serialNumbers",projectLawsInventoryOld.getSerialNumber());
+
+				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId());
+				// String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+				String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+				// 获取待办中心 - 飞书跳转链接
+				Map<String,Object> todoCenterParams = new HashMap<>();
+				todoCenterParams.put("projectNameCn",PRN_CN);
+				Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
+				params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
+				params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+
 				this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params);
 			}
 		}
@@ -757,6 +801,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("endTime",endTime);
 				params.put("userIdList",Arrays.asList(projectLawsInventoryOld.getDesignDutyId().split(",")));
 				params.put("serialNumbers",projectLawsInventoryOld.getSerialNumber());
+
+				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId());
+				// String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+				String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+				// 获取待办中心 - 飞书跳转链接
+				Map<String,Object> todoCenterParams = new HashMap<>();
+				todoCenterParams.put("projectNameCn",PRN_CN);
+				Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
+				params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
+				params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+
 				this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params);
 			}
 		}
@@ -786,6 +841,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					params.put("endTime",endTime);
 					params.put("userIdList",Arrays.asList(regulationOwnerId.split(",")));
 					params.put("serialNumbers",projectLawsInventoryEO.getSerialNumber());
+
+					ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId());
+					// String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+					// 获取待办中心 - 飞书跳转链接
+					Map<String,Object> todoCenterParams = new HashMap<>();
+					todoCenterParams.put("projectNameCn",PRN_CN);
+					Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
+					params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
+					params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+
 					this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params);
 				}
 
@@ -807,6 +873,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					params.put("endTime",endTime);
 					params.put("userIdList",Arrays.asList(regulationOwnerId.split(",")));
 					params.put("serialNumbers",projectLawsInventoryEO.getSerialNumber());
+
+
+					ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId());
+					// String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+					// 获取待办中心 - 飞书跳转链接
+					Map<String,Object> todoCenterParams = new HashMap<>();
+					todoCenterParams.put("projectNameCn",PRN_CN);
+					Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
+					params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
+					params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
 					this.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params);
 				}
 			}
@@ -3066,6 +3143,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			// workFlowSendMsg(jsonObject);
 			Map<String,Object> prarams = (Map<String, Object>) jsonObject.get("params");
 			String templateId = jsonObject.getString("templateId");
+
+			String projectLibraryId = (String) prarams.get("projectLibraryId");
+			ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+			// String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+			String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+			// 获取待办中心 - 飞书跳转链接
+			Map<String,Object> todoCenterParams = new HashMap<>();
+			todoCenterParams.put("projectNameCn",PRN_CN);
+			Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
+			prarams.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
+			prarams.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
 			this.sendMessageByTemplateId(templateId,prarams);
 		}
 
@@ -6157,6 +6245,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			paramsMsg.put("endTime",endTime);
 			paramsMsg.put("userIdList",userIdList);
 			paramsMsg.put("serialNumbers",serialNumbers);
+
+			ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+			String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+			String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+			// 获取法规清单 - 飞书跳转链接
+			Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN);
+			paramsMsg.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
+			paramsMsg.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+
+
 			this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(),paramsMsg);
 		}
 		return Result.OK("变更成功！");
@@ -9524,6 +9622,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					params.put("endTime",endTime);
 					params.put("userIdList",userIdList);
 					params.put("serialNumbers",serialNumbers);
+
+					ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+					// 获取法规清单 - 飞书跳转链接
+					Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN);
+					params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
+					params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+
 					this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE1.getValue(),params);
 				}
 			}
@@ -9566,6 +9673,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					params.put("endTime",endTime);
 					params.put("userIdList",userIdList);
 					params.put("serialNumbers",serialNumbers);
+
+					ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+					// 获取法规清单 - 飞书跳转链接
+					Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN);
+					params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
+					params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+
+
 					this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(),params);
 				}
 			}
@@ -9604,6 +9721,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					params.put("endTime",endTime);
 					params.put("userIdList",userIdList);
 					params.put("serialNumbers",serialNumbers);
+
+					ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+					// String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+					// 获取待办中心 - 飞书跳转链接
+					Map<String,Object> todoCenterParams = new HashMap<>();
+					todoCenterParams.put("projectNameCn",PRN_CN);
+					Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
+					params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
+					params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+
 					this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params);
 				}
 			}
@@ -9643,6 +9771,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					params.put("endTime",endTime);
 					params.put("userIdList",userIdList);
 					params.put("serialNumbers",serialNumbers);
+
+					ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+					// 获取法规清单 - 飞书跳转链接
+					Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN);
+					params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
+					params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+
 					this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(),params);
 				}
 			}
@@ -9681,6 +9818,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					params.put("endTime",endTime);
 					params.put("userIdList",userIdList);
 					params.put("serialNumbers",serialNumbers);
+
+					ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+					// String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+					// 获取待办中心 - 飞书跳转链接
+					Map<String,Object> todoCenterParams = new HashMap<>();
+					todoCenterParams.put("projectNameCn",PRN_CN);
+					Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
+					params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
+					params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+
 					this.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params);
 				}
 			}
@@ -10454,15 +10602,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		String cut = json.getString("cut");
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
-		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
-		String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
-		String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
-
-		// studio信息
-		SysUser studioUserInfo = this.sysUserMapper.selectOne(
-				new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer())
-		);
-
 		String ids = json.getString("ids");
 
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -10531,6 +10670,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		params.put("projectLibraryId",projectLibraryId);
 		params.put("endTime",inventoryAffirmDueDate);
 		params.put("userIdList",userIdList);
+
+		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+		String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+		String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+		// 获取法规清单 - 飞书跳转链接
+		Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN);
+		params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
+		params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+
 		this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE1.getValue(),params);
 
 		return Result.OK("发起清单确认成功！");
@@ -10542,15 +10690,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		String cut = json.getString("cut");
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
-		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
-		String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
-		String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
-
-		// studio信息
-		SysUser studioUserInfo = this.sysUserMapper.selectOne(
-				new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer())
-		);
-
 		String ids = json.getString("ids");
 		QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
         if(StringUtils.isEmpty(ids)){
@@ -10609,6 +10748,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		params.put("endTime",endTime);
 		params.put("userIdList",userIdList);
 		params.put("serialNumbers",serialNumbers);
+
+		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+		String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+		String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+		// 获取法规清单 - 飞书跳转链接
+		Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN);
+		params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
+		params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+
 		this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(),params);
 
 		return Result.OK("撤回成功！");
@@ -10668,6 +10816,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		params.put("endTime",endTime);
 		params.put("userIdList",userIdList);
 		params.put("serialNumbers",serialNumbers);
+
+		// 获取法规清单 - 飞书跳转链接
+		Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN);
+		params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
+		params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+
 		this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE3.getValue(),params);
 		return Result.OK("退回成功！");
 	}
@@ -10725,16 +10879,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			String contentEn = (String) params.get("contentEn");
 			String flowTypeCn = (String) params.get("flowTypeCn");
 			String flowTypeEn = (String) params.get("flowTypeEn");
+			String hrefFeishu_CN = (String) params.get("hrefFeishu_CN");
+			String hrefFeishu_EN = (String) params.get("hrefFeishu_EN");
 
 			ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
 
 			String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 			String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 
-			// 获取认证清单 - 飞书跳转链接
+
-			Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN);
-			String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN");
-			String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN");
 			try {
 				for (String userId : userIdList) {
 					String thirdId = this.sysUserService.getUserThirdIdByUserId(userInfoList,userId);
@@ -10792,6 +10945,27 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		return result;
 	}
 
+	@Override
+	public Map<String, Object> getToDoCenterLinkHrefFeishu(String projectLibraryId, Map<String,Object> todoCenterParams) {
+		// String projectNameCn = (String) todoCenterParams.get("projectNameCn");
+
+		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.getBaseMapper().selectProjectName(projectLibraryId);
+		String projectNameCn = projectLibraryBase.getProjectName();
+
+		Map<String,Object> result = new HashMap<>();
+
+		String hrefFeishu_CN = backUrl
+				+ JumpLinkEnum.FGRW_TO_DO_CENTER_LINK.getLink() + "?projectName=" + projectNameCn;
+
+		//飞书跳转链接
+		String hrefFeishu_EN = backUrl
+				+ JumpLinkEnum.FGRW_TO_DO_CENTER_LINK.getLink() + "?projectName=" + projectNameCn;
+
+		result.put("hrefFeishu_CN",hrefFeishu_CN);
+		result.put("hrefFeishu_EN",hrefFeishu_EN);
+		return result;
+	}
+
 	@Override
 	public void lawsInventoryEOListSortByInventoryAffirmDueDate(List<ProjectLawsInventoryEO> projectLawsInventoryEOS) {
 		Collections.sort(projectLawsInventoryEOS, new Comparator<ProjectLawsInventoryEO>() {

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml

@@ -46,7 +46,8 @@
                 pi.project_laws_inventory_id,
                 pi.buss_document_library_id,
                 pi.acti_proc_inst_id,
-                pni.project_name,
+                <!--pni.project_name,-->
+                concat( pni.project_name, '-', pyni.year_name ) AS project_name,
                 pyni.year_name,
                 pli.serial_number,
                 pli.title,
@@ -115,7 +116,8 @@
                    pi.project_laws_inventory_id,
                    pi.buss_document_library_id,
                    pi.acti_proc_inst_id,
-                   pni.project_name,
+                   <!--pni.project_name,-->
+                   concat( pni.project_name, '-', pyni.year_name ) AS project_name,
                    pyni.year_name,
                    pli.serial_number,
                    pli.title,
@@ -165,7 +167,8 @@
                    pi.project_laws_inventory_id,
                    pi.buss_document_library_id,
                    pi.acti_proc_inst_id,
-                   pni.project_name,
+                    <!--pni.project_name,-->
+                    concat( pni.project_name, '-', pyni.year_name ) AS project_name,
                    pyni.year_name,
                    '--' as serial_number,
                    '--' as standard_info,

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java

@@ -566,7 +566,8 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
 						projectVersion = data.getProjectVersion();
 					}
 
-					data.setProjectName(data.getProjectName() + "-" + data.getYearName() + "-" + targetMarket + "-" + projectVersion);
+					//data.setProjectName(data.getProjectName() + "-" + data.getYearName() + "-" + targetMarket + "-" + projectVersion);
+					data.setProjectName(data.getProjectName() + "-" + targetMarket + "-" + projectVersion);
 				}
 
 				//设置任务清单明细表id