From d383d27838638637509ea6b8edb7fac2663cdafd Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 28 Sep 2023 15:10:12 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E5=92=8C=E8=AE=A4=E8=AF=81=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=85=A5=EF=BC=88=E8=B4=A3=E4=BB=BB=E9=83=A8?= =?UTF-8?q?=E9=97=A8=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...atformProjectCertificationInventoryEOServiceImpl.java | 5 +++++ .../impl/PlatformProjectLawsInventoryEOServiceImpl.java | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java index a568a77b3..31f23a177 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java @@ -4991,6 +4991,11 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI value = pullMore(dictItemList, projectCertificationInventoryEO, errorMsg, dutyTerritory,msgList,"责任领域","Responsible Field","duty_territory"); if(StringUtils.isNotBlank(value)){ projectCertificationInventoryEO.setDutyTerritory(value); + List list = Arrays.asList(value.split(",")); + List ddList = dictItemList.stream().filter(e -> "duty_territory".equals(e.getDictCode()) && list.contains(e.getItemValue())).collect(Collectors.toList()); + List valueList = ddList.stream().map(SysDictItem::getStatNode).collect(Collectors.toList()); + projectCertificationInventoryEO.setDutyDepart(StringUtils.join(valueList,",")); + } } //工程接口人(责任领域下的工程接口人) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java index 2cc8f60b9..902dcf898 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java @@ -5592,6 +5592,15 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(value.split(",")); + List ddList = dictItemList.stream().filter(e -> "duty_territory".equals(e.getDictCode()) && list.contains(e.getItemValue())).collect(Collectors.toList()); + List valueList = ddList.stream().map(SysDictItem::getStatNode).collect(Collectors.toList()); + projectLawsInventoryEO.setDutyDepart(StringUtils.join(valueList,",")); + } + if (StringUtils.isNotBlank(value)) { //工程接口人(责任领域下的工程接口人) Map objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectLawsInventoryEOTemp.getProjectLibraryId(), value); From 4108fbd48a22e6e9b1a3a78340a6d6e8b28ee1a7 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 28 Sep 2023 15:17:48 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=92=8C=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectCertificationInventoryEOServiceImpl.java | 4 ++++ .../service/impl/ProjectLawsInventoryEOServiceImpl.java | 5 +++++ 2 files changed, 9 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 b84d9dd84..c9c01689f 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 @@ -4880,6 +4880,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(value.split(",")); + List ddList = dictItemList.stream().filter(e -> "duty_territory".equals(e.getDictCode()) && list.contains(e.getItemValue())).collect(Collectors.toList()); + List valueList = ddList.stream().map(SysDictItem::getStatNode).collect(Collectors.toList()); + projectCertificationInventoryEO.setDutyDepart(StringUtils.join(valueList,",")); } } //工程接口人(责任领域下的工程接口人) 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 65587a46f..d68ac9d55 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 @@ -5522,6 +5522,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(value.split(",")); + List ddList = dictItemList.stream().filter(e -> "duty_territory".equals(e.getDictCode()) && list.contains(e.getItemValue())).collect(Collectors.toList()); + List valueList = ddList.stream().map(SysDictItem::getStatNode).collect(Collectors.toList()); + projectLawsInventoryEO.setDutyDepart(StringUtils.join(valueList,",")); + //工程接口人(责任领域下的工程接口人) Map objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectLawsInventoryEOTemp.getProjectLibraryId(), value); From 7c37803d43d29a793b747b257bb1ba7751c3e936 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 28 Sep 2023 15:24:20 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA=E8=AF=AD?= 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 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 22bd59663..9e94e6906 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1120,7 +1120,7 @@ module.exports = { pleaseSelectinitiatedOrRejected: 'Please select the data whose design compliance confirmation process status is List Pending Release, Regulatory Engineer Returned or Verification Compliance Confirmation Process status is List Pending Release, Regulatory Engineer Returned', TheEngineerAndCertification: 'The Homo Engineer cannot be empty', pleaseSelectTheDataverificationVerified:'Please select the data whose design compliance confirmation process status is List Pending Verification, Responsible Person Rejected, or Verification Compliance Confirmation process status is List Pending Verification, Responsible Person Rejected', - pleaseSelectTheDataverification:'Select the data whose status of the design conformance verification process is Task ready to start and the responsible person rejects it, or the verification conformance verification process is list to be checked and the responsible person rejects it', + pleaseSelectTheDataverification:'Select the data whose design conformance verification process state is Task ready to start and the responsible person refuses, or verify conformance verification process state is task ready to start and the responsible person refuses', theResponsiblePersonAndDeadlineClank: 'The responsible person and deadline of cannot be blank', bringInTheProjectInterface: 'Assign to Owner', theCurrentListSaved: 'The current list data has been submitted and cannot be temporarily saved', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 13bbd7e5c..2e896649a 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -2622,7 +2622,7 @@ module.exports = { dataConfirmation: '请选择清单确认状态为未发起或拒绝的数据,以及法规工程师、认证工程师不为空', pleaseSelectinitiatedOrRejected: '请选择设计符合性确认流程状态为清单待发布、法规工程师退回或验证符合性确认流程状态为清单待发布、法规工程师退回的数据', pleaseSelectTheDataverificationVerified: '请选择设计符合性确认流程状态为清单待校核、责任人拒绝或验证符合性确认流程状态为清单待校核、责任人拒绝的数据', - pleaseSelectTheDataverification: '请选择设计符合性确认流程状态为任务待发起、责任人拒绝或验证符合性确认流程状态为清单待校核、责任人拒绝的数据', + pleaseSelectTheDataverification: '请选择设计符合性确认流程状态为任务待发起、责任人拒绝或验证符合性确认流程状态为任务待发起、责任人拒绝的数据', TheEngineerAndCertification: '的法规工程师不能为空', taskDataConfirmation: '请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据,以及工程接口人不为空', theProjectContactEmpty: '的工程接口人不能为空', From f3e5b3628b0a546923f2b2f46367c0230bb411fe Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 28 Sep 2023 15:30:41 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95-=E5=88=A0=E9=99=A4=E6=AD=A3?= =?UTF-8?q?=E5=9C=A8=E8=B5=B0=E6=B5=81=E7=A8=8B=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E6=8F=90=E7=A4=BA=E8=AF=AD=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/certificationList/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue index 2aee9c74d..ee67a06a4 100644 --- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue @@ -1138,7 +1138,7 @@ for (let i = 0; i < this.selectedRowKeysList.length; i++) { if (this.selectedRowKeysList[i].flowStatus == 'List to be checked' || this.selectedRowKeysList[i].flowStatus == 'Review and pass' || - this.selectedRowKeysList[i].flowStatus == 'Duty Person Rejected') { + this.selectedRowKeysList[i].flowStatus == 'Refusal of responsible person') { ids.push(this.selectedRowKeysList[i].id) } else { notConditions.push(this.selectedRowKeysList[i].inspectionItem) @@ -1501,7 +1501,7 @@ }, deleteLib(val) { let _this = this - if (val.flowStatus == 'List to be checked' || val.flowStatus == 'Review and pass' || val.flowStatus == 'Duty Person Rejected') { + if (val.flowStatus == 'List to be checked' || val.flowStatus == 'Review and pass' || val.flowStatus == 'Refusal of responsible person') { this.$confirm({ content: _this.$t('ConfirmDelete'), onOk() { From d4e9fcd6dd5b6e6261c6f3345db3abe1079f27f5 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 28 Sep 2023 15:42:39 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=95=BF=E5=BA=A6SQL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 51b763aec..6df33616f 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1241,3 +1241,10 @@ CREATE TABLE `laws_inventory_platform` ( `platform_laws_inventory_id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '平台件项目库法规清单id', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +--车修改字段长度2023-09-28 +ALTER TABLE `project_certification_directory` +MODIFY COLUMN `directory_name` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '目录名称' AFTER `project_library_id`, +MODIFY COLUMN `lot` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '批次' AFTER `directory_name`, +MODIFY COLUMN `detection_report_location` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '检测报告位置' AFTER `experiment_file`, +MODIFY COLUMN `explain_info` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '说明' AFTER `detection_report_location`;