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 5868282ee..ef7c6f917 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 @@ -23,6 +23,7 @@ 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.enums.ProjectRoleEnum; import com.jero.modules.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -132,7 +133,7 @@ public class InventoryAffirmJob implements Job { String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取法规清单 - 飞书跳转链接 - Map hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, ProjectRoleEnum.REGULATI_ENGINEER.getValue()); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); params.put("Initiator",projectLibraryBase.getStudioEngineerName()); @@ -161,7 +162,7 @@ public class InventoryAffirmJob implements Job { String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取法规清单 - 飞书跳转链接 - Map hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN,ProjectRoleEnum.REGULATI_ENGINEER.getValue()); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); params.put("Initiator",projectLibraryBase.getStudioEngineerName()); @@ -190,7 +191,7 @@ public class InventoryAffirmJob implements Job { String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取法规清单 - 飞书跳转链接 - Map hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN,ProjectRoleEnum.REGULATI_ENGINEER.getValue()); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); params.put("Initiator",projectLibraryBase.getStudioEngineerName()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java index 75e309358..8422527a0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java @@ -208,7 +208,7 @@ public interface IProjectLawsInventoryEOService extends IService params); - Map getProjectLawsInventoryLinkHrefFeishu(String projectLibraryId, String PRN_CN, String PRN_EN); + Map getProjectLawsInventoryLinkHrefFeishu(String projectLibraryId, String PRN_CN, String PRN_EN,String roleOpen); /** * 获取待办中心跳转链接 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 ed7b2ed78..92bed5f19 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 @@ -6486,7 +6486,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN); + Map hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue()); paramsMsg.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); paramsMsg.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); paramsMsg.put("Initiator",projectLibraryBase.getStudioEngineerName()); @@ -10336,7 +10336,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN); + Map hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue()); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); params.put("Initiator",projectLibraryBase.getStudioEngineerName()); @@ -10575,7 +10575,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN); + Map hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue()); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); params.put("Initiator",projectLibraryBase.getStudioEngineerName()); @@ -11263,7 +11263,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN); + Map hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue()); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); params.put("Initiator",projectLibraryBase.getStudioEngineerName()); @@ -11352,7 +11352,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN); + Map hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue()); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); params.put("Initiator",projectLibraryBase.getStudioEngineerName()); @@ -11420,7 +11420,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN); + Map hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue()); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); params.put("Initiator",projectLibraryBase.getStudioEngineerName()); @@ -11527,21 +11527,23 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl getProjectLawsInventoryLinkHrefFeishu(String projectLibraryId, String PRN_CN, String PRN_EN) { + public Map getProjectLawsInventoryLinkHrefFeishu(String projectLibraryId, String PRN_CN, String PRN_EN,String roleOpen) { Map result = new HashMap<>(); String hrefFeishu_CN = backUrl + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + projectLibraryId + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType() - + "&projectName=" + PRN_CN; + + "&projectName=" + PRN_CN + + "&roleOpen=" + roleOpen; //飞书跳转链接 String hrefFeishu_EN = backUrl + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + projectLibraryId + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType() - + "&projectName=" + PRN_EN; + + "&projectName=" + PRN_EN + + "&roleOpen=" + roleOpen; result.put("hrefFeishu_CN",hrefFeishu_CN); result.put("hrefFeishu_EN",hrefFeishu_EN);