From ee587c86b37810e979f16ec1977af30a9559e665 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Fri, 7 Apr 2023 11:34:32 +0800 Subject: [PATCH 1/4] update --- .../impl/ProjectCertificationInventoryEOServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 8704b8c3e..c8cb9ad00 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -4410,9 +4410,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(Arrays.asList(projectLibraryBase.getStudioEngineer().split(","))); - List certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")); - List certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList); - String certificationEngineerUserNames = certificationEngineerList.stream().map(SysUser::getUsername).distinct().collect(Collectors.joining(",")); + String certificationEngineerUserNames = ""; + if(StringUtils.isNotBlank(projectLibraryBase.getCertificationEngineer())){ + List certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")); + List certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList); + certificationEngineerUserNames = certificationEngineerList.stream().map(SysUser::getUsername).distinct().collect(Collectors.joining(",")); + } List pciLogEOList = new ArrayList<>(); for (ProjectCertificationInventoryEO pci : pciList) { From 89d65ddfe25b2f396b65601f2f5b93b04a541797 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 7 Apr 2023 11:45:06 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=A0=A1=E6=A0=B8=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E4=BB=8E=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83=E5=8A=9E=E7=90=86?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E8=BF=9B=E6=9D=A5=EF=BC=8C=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E6=B3=95=E8=A7=84=E5=B7=A5=E7=A8=8B=E5=B8=88?= =?UTF-8?q?=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/projectManagement/components/listOfRegulations.vue | 4 ++-- .../projectRegulationTasks/components/dealtWith.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 4b95b3d6f..cc1edc48d 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1504,8 +1504,8 @@ getAction(this.url.AndUserId, query).then((res) => { if (res.success) { // this.isDisplay = true - if (this.$route.query.roleOpen && this.$route.query.roleOpen == 'fggcs'){ - this.formInlineRoleSwitching.roleSwitchingCode = '1' + if (this.$route.query.roleOpen){ + this.formInlineRoleSwitching.roleSwitchingCode = this.$route.query.roleOpen }else{ this.formInlineRoleSwitching.roleSwitchingCode = res.result.roleCode } diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index 33e9aeef1..b7678eb70 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -267,7 +267,7 @@ targetMarket: row.targetMarket, studioEngineer: row.studioEngineer, type: '102', - roleOpen:'fggcs', + roleOpen:'1', } }) window.open(newUrl.href, '_blank') From 7143ffb00b762344569b68c7e0659871857471f4 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Fri, 7 Apr 2023 13:47:27 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=EF=BC=8C=E6=B3=95=E8=A7=84=E5=B7=A5=E7=A8=8B=E5=B8=88=E9=A3=9E?= =?UTF-8?q?=E4=B9=A6=E6=B6=88=E6=81=AF=E8=B7=B3=E8=BD=AC=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=EF=BC=8C=E5=AE=9A=E4=BD=8D=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=B8=88=E8=A7=92=E8=89=B2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/job/InventoryAffirmJob.java | 7 ++++--- .../IProjectLawsInventoryEOService.java | 2 +- .../ProjectLawsInventoryEOServiceImpl.java | 20 ++++++++++--------- 3 files changed, 16 insertions(+), 13 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 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); From 18a41e1d889be7de507dc5b9135dd03f4ef0dbae Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 7 Apr 2023 13:49:40 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A4=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsCollectManifestEOServiceImpl.java | 13 +++++++++---- .../head/service/impl/HeadCustomEOServiceImpl.java | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 9ffc6c5d9..3c805bcd0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1481,9 +1481,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl