From 80b3f0ee7a236d0037bb140daa998893a916b4cc Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Mon, 17 Apr 2023 19:13:43 +0800 Subject: [PATCH 01/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E4=BA=BA=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectLawsInventoryEOServiceImpl.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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 bf3cc5822..b05997bf2 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 @@ -12048,7 +12048,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl pliQueryWrap = new QueryWrapper<>(); pliQueryWrap.lambda().in(ProjectLawsInventoryEO::getId,projectLawsInventoryIdList); - List pliEoList = this.list(); + List pliEoList = this.list(pliQueryWrap); if(CollectionUtils.isNotEmpty(pliEoList)){ QueryWrapper piQueryWrap = new QueryWrapper<>(); piQueryWrap.lambda().in(ProcessInfoEO::getProjectLawsInventoryId,projectLawsInventoryIdList); @@ -12056,13 +12056,21 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { + pliEo.setDesignDutyId(designTransferUserId); + }); // 设计符合性相关待办任务强制转办 this.designCompulsoryTransfer(projectLibraryId, designTransferUserId, pliEoList, piEoList); } if(StringUtils.isNotEmpty(verifyTransferUserId)){ + pliEoList.forEach(pliEo -> { + pliEo.setVerifyDutyId(verifyTransferUserId); + }); // 验证符合性相关待办任务强制转办 this.verifyCompulsoryTransfer(projectLibraryId,verifyTransferUserId, pliEoList, piEoList); } + + this.updateBatchById(pliEoList); } } return Result.OK("强制转办成功！"); From b3556337e472286303921f2bad356d4e6f0d55de Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Mon, 17 Apr 2023 22:38:04 +0800 Subject: [PATCH 02/24] =?UTF-8?q?68381=20=E8=AE=A4=E8=AF=81=E6=B8=85?= =?UTF-8?q?=E5=8D=95-=E8=AE=A4=E8=AF=81=E5=B7=A5=E7=A8=8B=E5=B8=88?= =?UTF-8?q?=E9=80=80=E5=9B=9E=E6=88=96studio=E6=92=A4=E5=9B=9E=EF=BC=8C?= =?UTF-8?q?=E9=A3=9E=E4=B9=A6=E6=B6=88=E6=81=AF=E6=88=AA=E6=AD=A2=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectCertificationInventoryEOServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 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 b2d97dc70..8aea66520 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 @@ -2212,7 +2212,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl() { + /*Collections.sort(projectCertificationInventoryEOList, new Comparator() { @Override public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) { if(p1.getEndTime() != null && p2.getEndTime() != null){ @@ -2221,7 +2221,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl Date: Tue, 18 Apr 2023 09:34:02 +0800 Subject: [PATCH 03/24] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=97=E5=AE=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/certificationList/index.vue | 14 +++++++------- .../components/listOfRegulations.vue | 6 ++++++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 47a745ca8..540d1b48f 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -647,7 +647,7 @@ title: this.$t('category'), align: 'left', dataIndex: 'category', - width: 180, + width: 120, ellipsis: true, fixed: 'left', sorter: true @@ -672,7 +672,7 @@ title: 'WVTA ID', align: 'left', dataIndex: 'wvtaId', - width: 180, + width: 120, ellipsis: true }, { @@ -688,28 +688,28 @@ title: this.$t('areaOfResponsibility'), align: 'left', dataIndex: 'dutyTerritoryName', - width: 180, + width: 120, ellipsis: true }, { title: this.$t('certificationType'), align: 'left', dataIndex: 'attestationTypeName', - width: 180, + width: 120, ellipsis: true }, { title: this.$t('engineeringInterfacePerson'), align: 'left', dataIndex: 'sdtName', - width: 180, + width: 120, ellipsis: true }, { title: this.$t('personLiable'), align: 'left', dataIndex: 'dutyPersonName', - width: 180, + width: 120, ellipsis: true }, { @@ -740,7 +740,7 @@ title: this.$t('closingDate'), align: 'left', dataIndex: 'endTime', - width: 180, + width: 120, sorter: true, ellipsis: true }, diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 184af3aac..53dade147 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -812,6 +812,7 @@ dataIndex: 'designFlowStatusName', align: 'left', ellipsis: true, + sorter: true, width: 140, scopedSlots: { customRender: 'designFlowStatusName' } }, @@ -859,6 +860,7 @@ align: 'left', ellipsis: true, width: 180, + sorter: true, scopedSlots: { customRender: 'verifyFlowStatusName' } }, { @@ -2254,6 +2256,10 @@ this.orderByField = 'designDutyId' } else if (sorter.columnKey == 'verifyDutyIdName') { this.orderByField = 'verifyDutyId' + } else if (sorter.columnKey == 'verifyFlowStatusName') { + this.orderByField = 'verifyFlowStatus' + } else if (sorter.columnKey == 'designFlowStatusName') { + this.orderByField = 'designFlowStatus' } else { this.orderByField = sorter.columnKey } From a7d05cd09db99078fa03f4aabb6ac54694f281c9 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 18 Apr 2023 11:37:58 +0800 Subject: [PATCH 04/24] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=20?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=8A=B6=E6=80=81=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/projectManagement/components/listOfRegulations.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 184af3aac..60bc5237a 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -812,6 +812,7 @@ dataIndex: 'designFlowStatusName', align: 'left', ellipsis: true, + sorter: true, width: 140, scopedSlots: { customRender: 'designFlowStatusName' } }, @@ -858,6 +859,7 @@ dataIndex: 'verifyFlowStatusName', align: 'left', ellipsis: true, + sorter: true, width: 180, scopedSlots: { customRender: 'verifyFlowStatusName' } }, From 793242707a0eaaf5128077b81f5280335f33a407 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Tue, 18 Apr 2023 11:38:49 +0800 Subject: [PATCH 05/24] update --- .../todoCenter/service/impl/ProcessInfoEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java index 2018b7622..b13717f05 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java @@ -767,7 +767,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl Date: Tue, 18 Apr 2023 11:54:51 +0800 Subject: [PATCH 06/24] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BA=93id=EF=BC=8C=E6=9F=A5=E8=AF=A2=E8=AF=A5=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E4=B8=8B=E6=89=80=E6=9C=89=E7=9A=84=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BA=BA=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectRelatedPersonnelController.java | 14 +++++++ .../IProjectRelatedPersonnelService.java | 2 + .../ProjectLawsInventoryEOServiceImpl.java | 36 +++++++++++++++++ .../ProjectRelatedPersonnelServiceImpl.java | 40 +++++++++++++++++++ 4 files changed, 92 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java index f89d94d31..eb69d5e54 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java @@ -260,4 +260,18 @@ public class ProjectRelatedPersonnelController extends JeroController> regulatoryEngineerMapList = projectRelatedPersonnelService.queryLawEngineerByProjectId(params); return Result.OK(regulatoryEngineerMapList); } + + //engineeringInterfacePerson + /** + * 通过projectId查询法规工程师 + * + * @return + */ + @AutoLog(value = "项目库-相关人员维护表-根据projectId查询工程接口人") + @ApiOperation(value="项目库-相关人员维护表-根据projectId查询工程接口人", notes="项目库-相关人员维护表-根据projectId查询工程接口人") + @GetMapping(value = "/queryEngineeringInterfacePersonByProjectId") + public Result queryEngineeringInterfacePersonByProjectId(@RequestParam Map params){ + List> engineeringInterfacePersonMapList = projectRelatedPersonnelService.queryEngineeringInterfacePersonByProjectId(params); + return Result.OK(engineeringInterfacePersonMapList); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java index bb91c7abd..9e34642b4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java @@ -101,4 +101,6 @@ public interface IProjectRelatedPersonnelService extends IService> queryLawEngineerByProjectId(Map params); + + List> queryEngineeringInterfacePersonByProjectId(Map params); } 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 b05997bf2..3aa31a882 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 @@ -1588,6 +1588,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl{ +// if(e1.getDesignDeliverableTypeName() != null && e2.getDesignDeliverableTypeName() != null){ +// return comparator.compare(e1.getDesignDeliverableTypeName(),e2.getDesignDeliverableTypeName()); +// } +// return -1; +// }); +// }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ +// Collections.sort(result,(e1,e2)->{ +// if(e1.getDesignDeliverableTypeName() != null && e2.getDesignDeliverableTypeName() != null){ +// return comparator.compare(e2.getDesignDeliverableTypeName(),e1.getDesignDeliverableTypeName()); +// } +// return -1; +// }); +// } + } // 验证符合性排序 // 验证符合性-责任人 verifyDutyId @@ -1642,6 +1660,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl{ +// if(e1.getDesignDeliverableTypeName() != null && e2.getDesignDeliverableTypeName() != null){ +// return comparator.compare(e1.getDesignDeliverableTypeName(),e2.getDesignDeliverableTypeName()); +// } +// return -1; +// }); +// }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ +// Collections.sort(result,(e1,e2)->{ +// if(e1.getDesignDeliverableTypeName() != null && e2.getDesignDeliverableTypeName() != null){ +// return comparator.compare(e2.getDesignDeliverableTypeName(),e1.getDesignDeliverableTypeName()); +// } +// return -1; +// }); +// } + } } return result; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 9382bec93..9fdee8e89 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -1823,4 +1823,44 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl> queryEngineeringInterfacePersonByProjectId(Map params) { + List> resultList = new ArrayList<>(); + String projectLibraryId = (String) params.get("projectLibraryId"); + QueryWrapper queryWrapper = new QueryWrapper<>(); + List prpEoList = this.list(queryWrapper.eq("project_id", projectLibraryId)); + if(CollectionUtils.isNotEmpty(prpEoList)){ + List userIdList = new ArrayList<>(); + + String engineeringInterfacePersonIds = prpEoList.stream().filter(e->StringUtils.isNotEmpty(e.getEngineeringInterfacePerson())) + .map(ProjectRelatedPersonnel::getEngineeringInterfacePerson).collect(Collectors.joining(",")); + if(StringUtils.isNotEmpty(engineeringInterfacePersonIds)){ + userIdList.addAll(Arrays.asList(engineeringInterfacePersonIds.split(","))); + } + String engineerAttSetIds = prpEoList.stream().filter(e->StringUtils.isNotEmpty(e.getEngineerAttSet())) + .map(ProjectRelatedPersonnel::getEngineerAttSet).collect(Collectors.joining(",")); + if(StringUtils.isNotEmpty(engineerAttSetIds)){ + userIdList.addAll(Arrays.asList(engineerAttSetIds.split(","))); + } + String engineerLawSetIds = prpEoList.stream().filter(e->StringUtils.isNotEmpty(e.getEngineerLawSet())) + .map(ProjectRelatedPersonnel::getEngineerLawSet).collect(Collectors.joining(",")); + if(StringUtils.isNotEmpty(engineerLawSetIds)){ + userIdList.addAll(Arrays.asList(engineerLawSetIds.split(","))); + } + + if(CollectionUtils.isNotEmpty(userIdList)){ + List engineeringInterfacePersonList = this.sysUserService.querySysUserListByIdList(userIdList); + if(CollectionUtils.isNotEmpty(engineeringInterfacePersonList)){ + for (SysUser engineeringInterfacePerson : engineeringInterfacePersonList) { + Map engineeringInterfacePersonMap = new HashMap<>(); + engineeringInterfacePersonMap.put("id",engineeringInterfacePerson.getId()); + engineeringInterfacePersonMap.put("userName",engineeringInterfacePerson.getUsername()); + resultList.add(engineeringInterfacePersonMap); + } + } + } + } + return resultList; + } + } From 1cd1dd339a575bd57fe6078fc9e046b29d7281d8 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 18 Apr 2023 13:32:06 +0800 Subject: [PATCH 07/24] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 4 ++ jero-web/src/common/lang/zh-cn.js | 4 ++ .../components/globalAdvancedQuery/index.vue | 32 +++++++++- .../components/listOfRegulations.vue | 61 +++++++++++++++++-- 4 files changed, 93 insertions(+), 8 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 87f63b799..e7f18cd7d 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1796,4 +1796,8 @@ module.exports = { verify:'Verify', inventoryVerifyEndTime:'Inventory Verify End Time', taskConfirmEndTime:'Task Confirm End Time', + responsiblepersonfordesigncompliance:'Responsible person for design compliance', + responsiblepersonforverifyingcompliance:'Responsible person for verifying compliance', + verifytheconformancedeliverabletype:'Verify the conformance deliverable type', + designaconformancedeliverabletype:'Design a conformance deliverable type', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index d0291abba..3e40d7fa1 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1898,4 +1898,8 @@ module.exports = { verify:'验证', inventoryVerifyEndTime:'清单校核截止时间', taskConfirmEndTime:'责任确认截止时间', + responsiblepersonfordesigncompliance:'设计符合性责任人', + responsiblepersonforverifyingcompliance:'验证符合性责任人', + verifytheconformancedeliverabletype:'验证符合性交付物类型', + designaconformancedeliverabletype:'设计符合性交付物类型', } \ No newline at end of file diff --git a/jero-web/src/components/globalAdvancedQuery/index.vue b/jero-web/src/components/globalAdvancedQuery/index.vue index 9a6079385..f4ec4171e 100644 --- a/jero-web/src/components/globalAdvancedQuery/index.vue +++ b/jero-web/src/components/globalAdvancedQuery/index.vue @@ -141,7 +141,20 @@ :tree-data="item.tree" :placeholder="$t('PleaseSelect')" /> - + + { let data = { ...item } @@ -412,8 +428,16 @@ } } }, - methods: { + getDeliverableTree() { + getAction('/sys/category/getDeliverableTree', {}).then((res) => { + if (res.success) { + this.DeliverableTreeList = res.result + } else { + this.DeliverableTreeList = [] + } + }) + }, show() { if (!this.queryParamsModel || this.queryParamsModel.length === 0) { this.resetLine() @@ -484,6 +508,7 @@ }, handleSelected(node, item) { console.log(node) + console.log(item) let { type, options, dictCode, dictTable, dictText, customReturnField, popup } = node.dataRef item['type'] = type item['options'] = options @@ -498,6 +523,9 @@ this.$set(item, 'val', undefined) this.$set(item, 'valueName', undefined) this.$set(item, 'valueId', undefined) + if(item.type == 'deliverables'){ + this.getDeliverableTree() + } }, handleOpen() { this.show() diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 90cc8f14f..5d90900ff 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1251,18 +1251,40 @@ text: this.$t('certificationLevel'), dictCode: 'attestation_rank'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 }, + { + type: 'deliverables', + value: 'designDeliverableType', + text: this.$t('designaconformancedeliverabletype'), + }, + { + type: 'deliverables', + value: 'verifyDeliverableType', + text: this.$t('verifytheconformancedeliverabletype'), + }, + { + type: 'Personnel', + value: 'designDutyId', + valueName: 'designDutyIdName', + text: this.$t('responsiblepersonfordesigncompliance') + }, + { + type: 'Personnel', + value: 'verifyDutyId', + valueName: 'verifyDutyIdName', + text: this.$t('responsiblepersonforverifyingcompliance') + }, // { // type: '', // value: 'dutyTerritory', // text: this.$t('areaOfResponsibility'), // dictCode: 'duty_territory'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 // }, - { - type: 'Personnel', - value: 'engineeringInterfacePerson', - valueName: 'engineeringInterfacePersonName', - text: this.$t('engineeringInterfacePerson') - } + // { + // type: 'Personnel', + // value: 'engineeringInterfacePerson', + // valueName: 'engineeringInterfacePersonName', + // text: this.$t('engineeringInterfacePerson') + // } ], listOptions: [ { @@ -1414,6 +1436,7 @@ this.JLoading = true this.getHeader() this.queryLawEngineerByProjectId() + this.queryengineeringInterfacePersonId() this.getRoleByUserId(() => { this.getAndUserId() }) @@ -1530,6 +1553,32 @@ } }) }, + queryengineeringInterfacePersonId() { + let query = { + projectLibraryId: this.$route.query.id + } + getAction('/project/projectRelatedPersonnel/queryEngineeringInterfacePersonByProjectId', query).then((res) => { + if (res.success) { + let engineeringInterfacePerson = { + value: 'engineeringInterfacePerson', + text: this.$t('engineeringInterfacePerson'), + options: [] + } + if (res.result && res.result.length > 0) { + res.result.forEach(val => { + engineeringInterfacePerson.options.push({ + value: val.id, + key: val.id, + label: val.userName + }) + }) + } + this.fieldList.push(engineeringInterfacePerson) + } else { + + } + }) + }, //流程状态点击事件 designFlowStatusClick(row, name) { let query = {} From 19aa110dc52dbd3eb017fadcf77018b8addaa120 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 18 Apr 2023 13:45:30 +0800 Subject: [PATCH 08/24] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=8A=B6=E6=80=81=20?= =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/projectManagement/components/listOfRegulations.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 5d90900ff..0e23418c8 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -812,7 +812,6 @@ dataIndex: 'designFlowStatusName', align: 'left', ellipsis: true, - sorter: true, width: 140, scopedSlots: { customRender: 'designFlowStatusName' } }, @@ -859,9 +858,7 @@ dataIndex: 'verifyFlowStatusName', align: 'left', ellipsis: true, - sorter: true, width: 180, - sorter: true, scopedSlots: { customRender: 'verifyFlowStatusName' } }, { From 91724e6816bde7fa937eb629414f1395ecf6b5e6 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Tue, 18 Apr 2023 13:55:02 +0800 Subject: [PATCH 09/24] update --- .../impl/ProjectRelatedPersonnelServiceImpl.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 9fdee8e89..674640af9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -1832,23 +1832,24 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl userIdList = new ArrayList<>(); - String engineeringInterfacePersonIds = prpEoList.stream().filter(e->StringUtils.isNotEmpty(e.getEngineeringInterfacePerson())) - .map(ProjectRelatedPersonnel::getEngineeringInterfacePerson).collect(Collectors.joining(",")); + String engineeringInterfacePersonIds = prpEoList.stream().map(ProjectRelatedPersonnel::getEngineeringInterfacePerson) + .filter(e->StringUtils.isNotEmpty(e)).collect(Collectors.joining(",")); if(StringUtils.isNotEmpty(engineeringInterfacePersonIds)){ userIdList.addAll(Arrays.asList(engineeringInterfacePersonIds.split(","))); } - String engineerAttSetIds = prpEoList.stream().filter(e->StringUtils.isNotEmpty(e.getEngineerAttSet())) - .map(ProjectRelatedPersonnel::getEngineerAttSet).collect(Collectors.joining(",")); + String engineerAttSetIds = prpEoList.stream().map(ProjectRelatedPersonnel::getEngineerAttSet) + .filter(e->StringUtils.isNotEmpty(e)).collect(Collectors.joining(",")); if(StringUtils.isNotEmpty(engineerAttSetIds)){ userIdList.addAll(Arrays.asList(engineerAttSetIds.split(","))); } - String engineerLawSetIds = prpEoList.stream().filter(e->StringUtils.isNotEmpty(e.getEngineerLawSet())) - .map(ProjectRelatedPersonnel::getEngineerLawSet).collect(Collectors.joining(",")); + String engineerLawSetIds = prpEoList.stream().map(ProjectRelatedPersonnel::getEngineerLawSet) + .filter(e->StringUtils.isNotEmpty(e)).collect(Collectors.joining(",")); if(StringUtils.isNotEmpty(engineerLawSetIds)){ userIdList.addAll(Arrays.asList(engineerLawSetIds.split(","))); } if(CollectionUtils.isNotEmpty(userIdList)){ + userIdList = userIdList.stream().filter(userId -> StringUtils.isNotEmpty(userId)).collect(Collectors.toList()); List engineeringInterfacePersonList = this.sysUserService.querySysUserListByIdList(userIdList); if(CollectionUtils.isNotEmpty(engineeringInterfacePersonList)){ for (SysUser engineeringInterfacePerson : engineeringInterfacePersonList) { From d750766a85aafbffdc73908f8eb2ca9607b3fbf3 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 18 Apr 2023 14:36:38 +0800 Subject: [PATCH 10/24] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=A4=E8=AF=81=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/certificationList/index.vue | 14 +++++----- .../components/addModel.vue | 20 ++++++++++++++ .../components/editModel.vue | 26 +++++++++++++++++++ .../certificationListMaintenance.vue | 7 +++++ 4 files changed, 60 insertions(+), 7 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 540d1b48f..eefdc43ae 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -668,6 +668,13 @@ width: 100, ellipsis: true }, + { + title: this.$t('certificationType'), + align: 'left', + dataIndex: 'attestationTypeName', + width: 120, + ellipsis: true + }, { title: 'WVTA ID', align: 'left', @@ -691,13 +698,6 @@ width: 120, ellipsis: true }, - { - title: this.$t('certificationType'), - align: 'left', - dataIndex: 'attestationTypeName', - width: 120, - ellipsis: true - }, { title: this.$t('engineeringInterfacePerson'), align: 'left', diff --git a/jero-web/src/views/virtualAuthenticationList/components/addModel.vue b/jero-web/src/views/virtualAuthenticationList/components/addModel.vue index c6e0407ae..a8f62b3a7 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/addModel.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/addModel.vue @@ -146,6 +146,23 @@ + +
+
+ * + {{$t('certificationType')}} +
+ + + +
+
@@ -435,4 +452,7 @@ export default { border: 1px #00B3BE solid; color: #00B3BE; } +::v-deep .attestationType .ant-form-explain{ + margin-top: -16px; +} \ No newline at end of file diff --git a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue index f24bf95ad..d701773f9 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue @@ -61,6 +61,22 @@
+ +
+
+ * + {{$t('certificationType')}} +
+ + + +
+ @@ -211,6 +227,13 @@ export default { trigger: 'change' } ], + attestationType: [ + { + required: true, + message: this.$t('certificationType') + this.$t('cannotEmpty'), + trigger: 'change' + } + ], category: [ { required: true, @@ -425,4 +448,7 @@ export default { ::v-deep .ant-select-disabled .ant-select-selection-selected-value{ color: #040B29!important; } +::v-deep .attestationType .ant-form-explain{ + margin-top: -16px; +} \ No newline at end of file diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue index d7755f2e8..774a893e0 100644 --- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue +++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue @@ -331,6 +331,13 @@ width: 200, ellipsis: true }, + { + title: this.$t('certificationType'), + align: 'left', + dataIndex: 'attestationTypeName', + width: 180, + ellipsis: true + }, { title: 'WVTA ID', align: 'left', From 45fe7481fa88bf2c605e96487ca46911249f4545 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Tue, 18 Apr 2023 14:44:17 +0800 Subject: [PATCH 11/24] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E3=80=81=E7=BC=96=E8=BE=91=E3=80=81=E5=AF=BC=E5=85=A5=E3=80=81?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E3=80=81=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 4 ++- .../entity/AuthDummyInventoryInfoEO.java | 9 +++++++ .../entity/AuthDummyInventoryInfoEOEn.java | 6 +++++ .../AuthDummyInventoryInfoEOServiceImpl.java | 26 +++++++++++++++---- 4 files changed, 39 insertions(+), 6 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 83bcbfc1f..b851236bb 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -619,4 +619,6 @@ INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `descrip INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1646033251040337922', '1646032917672861697', '地标', 'dfbc363b6e2d4d9c97664aeb6731767e', NULL, 3, 1, 'admin', '2023-04-12 14:11:24', NULL, NULL, 1, NULL, NULL, '0', 'Landmark'); INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1646033351942709250', '1646032917672861697', '其他', '17a3731e5a374d8ba3909cca2464a8eb', NULL, 4, 1, 'admin', '2023-04-12 14:11:48', NULL, NULL, 1, NULL, NULL, '0', 'Other'); - +-- 市场认证清单 增加字段 2023-04-17 未同步生产环境 +ALTER TABLE `auth_dummy_inventory_info` + ADD COLUMN `attestation_type` varchar(2000) NULL COMMENT '认证类型' AFTER `deliverable_template`; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java index fce9cc117..69cd8bdf5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java @@ -77,6 +77,11 @@ public class AuthDummyInventoryInfoEO implements Serializable { @ApiModelProperty(value = "配置项") private java.lang.String configItem; + /**认证类型名称**/ + @Excel(name = "认证类型", width = 20) + @TableField(exist = false) + private String attestationTypeName; + /**WVTA ID*/ @Excel(name = "WVTA ID", width = 15) @ApiModelProperty(value = "WVTA ID") @@ -149,4 +154,8 @@ public class AuthDummyInventoryInfoEO implements Serializable { // 1顺序 2倒序 @TableField(exist = false) private String orderBy; + + /**认证类型*/ + @ApiModelProperty(value = "认证类型") + private String attestationType; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEOEn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEOEn.java index 16a256048..cd6089938 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEOEn.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEOEn.java @@ -74,6 +74,12 @@ public class AuthDummyInventoryInfoEOEn implements Serializable { @ApiModelProperty(value = "配置项") private String configItem; + /**认证类型*/ + @Excel(name = "Certification Type", width = 20) + @ApiModelProperty(value = "认证类型") + @TableField(exist = false) + private String attestationTypeName; + /**WVTA ID*/ @Excel(name = "WVTA ID", width = 15) @ApiModelProperty(value = "WVTA ID") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java index 2e9ac51b3..605ac3bf8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java @@ -957,9 +957,9 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl 1){ @@ -1293,6 +1293,10 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl list = Arrays.asList(title.split(",")); @@ -1896,6 +1908,10 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl Date: Tue, 18 Apr 2023 14:55:08 +0800 Subject: [PATCH 12/24] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=85=A5=E3=80=81=E5=AF=BC=E5=87=BA=E3=80=81?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD=EF=BC=8C=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E7=B1=BB=E5=88=AB=E5=AD=97=E6=AE=B5=E9=A1=BA=E5=BA=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ProjectCertificationInventoryEO.java | 10 +++++----- .../ProjectCertificationInventoryEOEn.java | 11 ++++++----- ...ojectCertificationInventoryEOServiceImpl.java | 16 ++++++++-------- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java index e17baecfb..0b9b7985a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java @@ -80,6 +80,11 @@ public class ProjectCertificationInventoryEO implements Serializable { @Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4") private String configItem; + /**认证类型名称**/ + @Excel(name = "认证类型", width = 20) + @TableField(exist = false) + private String attestationTypeName; + /**WVTA ID*/ @Excel(name = "WVTA ID", width = 20) @ApiModelProperty(value = "WVTA ID") @@ -246,9 +251,4 @@ public class ProjectCertificationInventoryEO implements Serializable { /**认证类型*/ @ApiModelProperty(value = "认证类型") private String attestationType; - - /**认证类型名称**/ - @Excel(name = "认证类型", width = 20) - @TableField(exist = false) - private String attestationTypeName; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEn.java index 2e46eece5..6136ab470 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEn.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEn.java @@ -78,6 +78,12 @@ public class ProjectCertificationInventoryEOEn implements Serializable { @Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4") private java.lang.String configItem; + /**认证类型*/ + @Excel(name = "Certification Type", width = 20) + @ApiModelProperty(value = "认证类型") + @TableField(exist = false) + private String attestationTypeName; + /**WVTA ID*/ @Excel(name = "WVTA ID", width = 20) @ApiModelProperty(value = "WVTA ID") @@ -219,9 +225,4 @@ public class ProjectCertificationInventoryEOEn implements Serializable { @TableField(exist = false) private String endTimeStr; - /**认证类型*/ - @Excel(name = "Certification Type", width = 20) - @ApiModelProperty(value = "认证类型") - @TableField(exist = false) - private String attestationTypeName; } 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 8aea66520..e2fec6d61 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 @@ -3266,12 +3266,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl Date: Tue, 18 Apr 2023 15:11:10 +0800 Subject: [PATCH 13/24] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 +- jero-web/src/common/lang/zh-cn.js | 2 +- .../projectManagement/components/certificationList/index.vue | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index e7f18cd7d..c6425324e 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1724,7 +1724,7 @@ module.exports = { cantTransferToYourself:"Can't transfer to yourself", theDataYouInitiate:'The data you selected does not meet the process initiation criteria. Please recheck and initiate', dataWithProcessReleasedCannotBeReset:'Data with a process status of list to be released cannot be reset', - reasonForReturnOfDesignCompliance:'Reason for compliance return', + reasonForReturnOfDesignCompliance:'Reason for the return by the regulation engineer', noteone:'Note: CSV format is supported. The value is within 20M and the number is 1 to 10', notetwo:'\n1. Provide the modified or expanded batch of "Announcement" and supporting materials;\n2. Verification materials shall be submitted to ensure that products meet the relevant requirements of national laws and regulations, technologies, standards and technical specifications;\n', notethree:'Provide supporting materials', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 3e40d7fa1..b67cfd46b 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1827,7 +1827,7 @@ module.exports = { notecsv: '注:支持CSV格式，大小20M以内', theDataYouInitiate: '您所选的数据，均不符合流程发起条件，请重新检查后发起', dataWithProcessReleasedCannotBeReset: '流程状态为清单待发布的数据不能被重置', - reasonForReturnOfDesignCompliance: '符合性退回原因', + reasonForReturnOfDesignCompliance: '法规工程师退回原因', notetwo: '\n1、提供变更或扩展后的《公告》批次及证明材料;\n2、应提交验证材料，保障产品符合国家法律法规、技术、标准及技术规范等相关要求;\n', notethree: '\n提供证明材料\n', verifyComplianceConfirmReturnReason: '验证符合性确认退回原因', diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index eefdc43ae..b92866a52 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -680,6 +680,7 @@ align: 'left', dataIndex: 'wvtaId', width: 120, + sorter: true, ellipsis: true }, { @@ -696,6 +697,7 @@ align: 'left', dataIndex: 'dutyTerritoryName', width: 120, + sorter: true, ellipsis: true }, { @@ -703,6 +705,7 @@ align: 'left', dataIndex: 'sdtName', width: 120, + sorter: true, ellipsis: true }, { @@ -710,6 +713,7 @@ align: 'left', dataIndex: 'dutyPersonName', width: 120, + sorter: true, ellipsis: true }, { @@ -780,6 +784,7 @@ title: this.$t('CertificationProgress'), align: 'left', dataIndex: 'certificationProgress', + sorter: true, width: localStorage.getItem('language') == 'zh-cn' ? 180 : 200, ellipsis: true, scopedSlots: { customRender: 'CertificationProgress' } From be72d5f962e9466f5b40e20ee8b2af5492b901db Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Tue, 18 Apr 2023 15:16:35 +0800 Subject: [PATCH 14/24] update --- .../todoCenter/service/impl/ProcessInfoEOServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java index b13717f05..ea504c0db 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java @@ -817,6 +817,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl Date: Tue, 18 Apr 2023 15:23:38 +0800 Subject: [PATCH 15/24] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/projectManagement/ProjectDetails/index.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue index d0e39fd0a..53f82fb69 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -105,6 +105,7 @@
{{$t('projectStatus')}} @@ -144,6 +145,7 @@
From adbc45f760913b8cb659cc667d1e39f3f001e96f Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Tue, 18 Apr 2023 15:28:01 +0800 Subject: [PATCH 16/24] =?UTF-8?q?UAT=2081=E6=9D=A1=E3=80=82=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95=E5=A2=9E=E5=8A=A0=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ctCertificationInventoryEOServiceImpl.java | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) 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 e2fec6d61..43d6398f5 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 @@ -1439,6 +1439,24 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl{ + String e1WvtaId = (StringUtils.isNotEmpty(e1.getWvtaId()) ? e1.getWvtaId() : ""); + String e2WvtaId = (StringUtils.isNotEmpty(e2.getWvtaId()) ? e2.getWvtaId() : ""); + return comparator.compare(e1WvtaId,e2WvtaId); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(datas,(e1,e2)->{ + String e1WvtaId = (StringUtils.isNotEmpty(e1.getWvtaId()) ? e1.getWvtaId() : ""); + String e2WvtaId = (StringUtils.isNotEmpty(e2.getWvtaId()) ? e2.getWvtaId() : ""); + return comparator.compare(e2WvtaId,e1WvtaId); + }); + } + } + // 标准编号 serialNumber if(StringUtils.equals("serialNumber",orderByField)){ if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ @@ -1456,6 +1474,57 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl{ + String e1DutyTerritoryName = (StringUtils.isNotEmpty(e1.getDutyTerritoryName()) ? e1.getDutyTerritoryName() : ""); + String e2DutyTerritoryName = (StringUtils.isNotEmpty(e2.getDutyTerritoryName()) ? e2.getDutyTerritoryName() : ""); + return comparator.compare(e1DutyTerritoryName,e2DutyTerritoryName); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(datas,(e1,e2)->{ + String e1DutyTerritoryName = (StringUtils.isNotEmpty(e1.getDutyTerritoryName()) ? e1.getDutyTerritoryName() : ""); + String e2DutyTerritoryName = (StringUtils.isNotEmpty(e2.getDutyTerritoryName()) ? e2.getDutyTerritoryName() : ""); + return comparator.compare(e2DutyTerritoryName,e1DutyTerritoryName); + }); + } + } + + // 工程接口人 sdtName + if(StringUtils.equals("sdtName",orderByField)){ + if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ + Collections.sort(datas,(e1, e2)->{ + String e1SdtName = (StringUtils.isNotEmpty(e1.getSdtName()) ? e1.getSdtName() : ""); + String e2SdtName = (StringUtils.isNotEmpty(e2.getSdtName()) ? e2.getSdtName() : ""); + return comparator.compare(e1SdtName,e2SdtName); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(datas,(e1,e2)->{ + String e1SdtName = (StringUtils.isNotEmpty(e1.getSdtName()) ? e1.getSdtName() : ""); + String e2SdtName = (StringUtils.isNotEmpty(e2.getSdtName()) ? e2.getSdtName() : ""); + return comparator.compare(e2SdtName,e1SdtName); + }); + } + } + + // 责任人 dutyPersonName + if(StringUtils.equals("dutyPersonName",orderByField)){ + if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ + Collections.sort(datas,(e1, e2)->{ + String e1DutyPersonName = (StringUtils.isNotEmpty(e1.getDutyPersonName()) ? e1.getDutyPersonName() : ""); + String e2DutyPersonName = (StringUtils.isNotEmpty(e2.getDutyPersonName()) ? e2.getDutyPersonName() : ""); + return comparator.compare(e1DutyPersonName,e2DutyPersonName); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(datas,(e1,e2)->{ + String e1DutyPersonName = (StringUtils.isNotEmpty(e1.getDutyPersonName()) ? e1.getDutyPersonName() : ""); + String e2DutyPersonName = (StringUtils.isNotEmpty(e2.getDutyPersonName()) ? e2.getDutyPersonName() : ""); + return comparator.compare(e2DutyPersonName,e1DutyPersonName); + }); + } + } + // 交付物类型 deliverableTypeName if(StringUtils.equals("deliverableTypeName",orderByField)){ if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ From e4d784f79adfeaa4f4b7cfca4e567570aaa2996d Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 18 Apr 2023 15:28:20 +0800 Subject: [PATCH 17/24] =?UTF-8?q?=E6=94=BE=E5=BC=80=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=9D=83=E9=99=90=20=E8=A1=A8=E5=A4=B4?= =?UTF-8?q?=E7=BC=A9=E7=AA=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/parameter/managementdetails/index.vue | 3 ++- .../components/ParameterItemCollectionList.vue | 3 ++- .../components/certificationList/index.vue | 14 +++++++------- .../components/listOfRegulations.vue | 3 ++- .../certificationListMaintenance.vue | 6 +++--- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index 778ed12b4..2b7829bc7 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -101,8 +101,9 @@ {{$t('CustomExport')}} + + placement="bottomRight" >