From 63115a38440eab402be38189bca979a6847863d2 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 31 Mar 2023 10:08:50 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=87=E5=87=86=E4=BF=A1=E6=81=AF=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../problemKnowledgeBase/components/listAddModel.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue index 844c05870..686a16c12 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue @@ -21,7 +21,7 @@ v-model="queryParam.serial_number"> - + - - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - - + + + + {{$t('reset')}} {{$t('query')}} Date: Fri, 31 Mar 2023 10:19:47 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=B8=8D=E8=83=BD=E4=B8=BA=E7=A9=BA=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/projectManagement/components/addModel.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue index 0cd3de35b..d7735e43c 100644 --- a/jero-web/src/views/projectManagement/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/addModel.vue @@ -329,6 +329,13 @@ trigger: 'blur' } ], + projectVersion:[ + { + required: true, + message: this.$t('projectVersion') + this.$t('cannotEmpty'), + trigger: 'blur' + } + ], digitalPlatform: [ { max: 100, From b03fa7b5169ee417cbf7acd883d648a29a47c2fa Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 31 Mar 2023 10:21:14 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=AF=B9=E5=A4=96=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=95=BF=E5=BA=A6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/externalReports/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index 920677cbc..dacac5793 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -385,7 +385,7 @@ ellipsis: true, dataIndex: 'fileName', scopedSlots: { customRender: 'fileName' }, - width: 200 + width: 400 }, { title: this.$t('fileDeclaration'), @@ -393,7 +393,7 @@ ellipsis: true, dataIndex: 'fileDescription', scopedSlots: { customRender: 'projectName' }, - width: 300 + width: 400 }, { title: this.$t('uploadedBy'), @@ -412,14 +412,14 @@ align: 'left', ellipsis: true, dataIndex: 'createTime', - width: 250 + width: 150 }, { title: this.$t('operation'), align: 'left', fixed: 'right', ellipsis: true, - width: 250, + width: 150, scopedSlots: { customRender: 'operation' } } ], From c57c18d144b94a8919cc52bbdf0f1c18756777ff Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Fri, 31 Mar 2023 10:27:10 +0800 Subject: [PATCH 4/6] =?UTF-8?q?67326=E3=80=8167317=20=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/ISysUserService.java | 2 + .../service/impl/SysUserServiceImpl.java | 13 ++ .../ProjectLawsInventoryEOServiceImpl.java | 165 ++++++++++++------ 3 files changed, 130 insertions(+), 50 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java index fb1881817..6d88c32c4 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java @@ -319,4 +319,6 @@ public interface ISysUserService extends IService { * @return */ String getUsernameByUserId(List sysUserList, String userId); + + List querySysUserByUserNameList(List userNameList); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index 4f8cc64cb..5a145e722 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -797,4 +797,17 @@ public class SysUserServiceImpl extends ServiceImpl impl } return result; } + + @Override + public List querySysUserByUserNameList(List userNameList) { + List result = new ArrayList<>(); + if(CollectionUtils.isNotEmpty(userNameList)){ + userNameList = userNameList.stream().distinct().collect(Collectors.toList()); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().in(SysUser::getUsername,userNameList); + result = this.list(queryWrapper); + } + return result; + } } 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 01db4e5b0..e3a7242c3 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 @@ -6790,6 +6790,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl userNameList = new ArrayList<>(); + String designDutyIds = dataList.stream().map(ProjectLawsInventoryEO::getDesignDutyId).collect(Collectors.joining(",")); + String verifyDutyIds = dataList.stream().map(ProjectLawsInventoryEO::getVerifyDutyId).collect(Collectors.joining(",")); + userNameList.addAll(Arrays.asList(designDutyIds.split(","))); + userNameList.addAll(Arrays.asList(verifyDutyIds.split(","))); + List sysUserList = this.sysUserService.querySysUserByUserNameList(userNameList); + //编号验证 verifySerialNumber(dataList,projectLawsInventoryEOTemp,dataSource); for (ProjectLawsInventoryEO projectLawsInventoryEO : dataList) { @@ -6917,52 +6924,54 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectLawsInventoryEOTemp.getProjectLibraryId(), value); + + //法规工程师 + List> mapLawList = (List>) objectMap.get("lawEngineerList"); + //认证工程师 + List> mapCertificationList = (List>) objectMap.get("certificationEngineerList"); + //工程接口人 + List> mapPersonList = (List>) objectMap.get("engineeringInterfacePersonList"); + //所有人 + List> allPersonList = (List>) objectMap.get("allPersonList"); + projectLawsInventoryEO.setDutyTerritory(value); + + // 如果责任领域存在，再匹配这些人员 + //法规工程师 + if(StringUtils.isNotBlank(regulationOwnerId)){ + nameCn = "法规工程师"; + nameEn = "regulatory engineer"; + //验证人员是否存在 + personnelVerify(projectLawsInventoryEO, errorMsg, msgList, regulationOwnerId, mapLawList,nameCn,nameEn, ProjectRoleEnum.REGULATI_ENGINEER.getValue()); + } + + //认证工程师 + if(StringUtils.isNotBlank(homologationEngineerId)){ + nameCn = "认证工程师"; + nameEn = "certification engineer "; + //验证人员是否存在 + personnelVerify(projectLawsInventoryEO, errorMsg, msgList, homologationEngineerId, mapCertificationList,nameCn,nameEn,ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue()); + } + + //工程接口人 + if(StringUtils.isNotBlank(engineeringInterfacePerson)){ + nameCn = "工程接口人"; + nameEn = "Engineering Interface "; + //验证人员是否存在 + personnelVerify(projectLawsInventoryEO, errorMsg, msgList, engineeringInterfacePerson, mapPersonList,nameCn,nameEn,ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue()); + } } } - //工程接口人(责任领域下的工程接口人) - Map objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectLawsInventoryEOTemp.getProjectLibraryId(), value); - - //法规工程师 - List> mapLawList = (List>) objectMap.get("lawEngineerList"); - //认证工程师 - List> mapCertificationList = (List>) objectMap.get("certificationEngineerList"); - //工程接口人 - List> mapPersonList = (List>) objectMap.get("engineeringInterfacePersonList"); - //所有人 - List> allPersonList = (List>) objectMap.get("allPersonList"); - - String nameCn = ""; - String nameEn = ""; - //法规工程师 - if(StringUtils.isNotBlank(regulationOwnerId)){ - nameCn = "法规工程师"; - nameEn = "regulatory engineer"; - //验证人员是否存在 - personnelVerify(projectLawsInventoryEO, errorMsg, msgList, regulationOwnerId, mapLawList,nameCn,nameEn, ProjectRoleEnum.REGULATI_ENGINEER.getValue()); - } - - //认证工程师 - if(StringUtils.isNotBlank(homologationEngineerId)){ - nameCn = "认证工程师"; - nameEn = "certification engineer "; - //验证人员是否存在 - personnelVerify(projectLawsInventoryEO, errorMsg, msgList, homologationEngineerId, mapCertificationList,nameCn,nameEn,ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue()); - } - - //工程接口人 - if(StringUtils.isNotBlank(engineeringInterfacePerson)){ - nameCn = "工程接口人"; - nameEn = "Engineering Interface "; - //验证人员是否存在 - personnelVerify(projectLawsInventoryEO, errorMsg, msgList, engineeringInterfacePerson, mapPersonList,nameCn,nameEn,ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue()); - } - //设计 //交付物类型 @@ -6979,19 +6988,19 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl msgList, + String userName, + List sysUserList, + String nameCn,String nameEn, + String fieldNumber) { + //单选 + if(userName.contains(",")){ + if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ + errorMsg += nameCn + "导入只能填写一个用户名, "; + }else{ + errorMsg += "Only one user name can be entered for"+ nameEn +"import, "; + } + msgList.add(errorMsg); + } + if(sysUserList.size() != 0){ + int count = 0; + for (SysUser sysUser : sysUserList) { + if(StringUtils.equals(userName,sysUser.getUsername())){ + count ++; + if(ProjectRoleEnum.DESIGNDUTY.getValue().equals(fieldNumber)) { + projectLawsInventoryEO.setDesignDutyId(sysUser.getId()); + }else if(ProjectRoleEnum.VERIFYDUTY.getValue().equals(fieldNumber)){ + projectLawsInventoryEO.setVerifyDutyId(sysUser.getId()); + } + break; + } + } + if(count == 0){ + if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ + errorMsg += nameCn+userName+"在系统中不存在， "; + }else{ + errorMsg += nameEn+userName+"Does not exist in the system, "; + } + msgList.add(errorMsg); + } + }else{ + if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ + errorMsg += nameCn+userName+"在系统中不存在， "; + }else{ + errorMsg += nameEn+userName+"Does not exist in the system, "; + } + msgList.add(errorMsg); + } + } } From f847b60dd556aa3211f3104ed3a65cd89415a6b7 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 31 Mar 2023 10:38:43 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/projectManagement/projectStatusBoard/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue index 57c25a03a..735cfdab6 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue @@ -513,6 +513,7 @@ export default { window.open(newUrl.href, '_blank') }, projectInfoClick(item){ + item.projectName = item.showName let newUrl = this.$router.resolve({ path: '/ProjectDetails', query: item From 5d3f8c67fef1c28d33e112bd195176e373bd8053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 31 Mar 2023 10:47:10 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E6=B7=BB=E5=8A=A0=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/certificationList/components/addModel.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue index 9c55878d8..ae8c48599 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -21,6 +21,7 @@ +