From 882fd17a8fc91681e54a0ebf88bc1376e66e071f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 3 Apr 2023 09:47:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=BA=93-=E8=AF=A6=E6=83=85=E9=A1=B5-=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93=E8=AF=A6=E6=83=85=E9=A1=B5=E7=9A=84?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../certificationList/components/addModel.vue | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 214608932..fb7c4627c 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -163,15 +163,16 @@ :prop="'dataList.'+index+'.deliverableType'" :rules="[{ required: true, message: $t('typeOfDeliverables') + $t('cannotEmpty'), trigger: 'change'},]" > + @@ -740,16 +741,16 @@ } this.formInline = { ...this.formInline } }, - clickButtonToUpload(item, index,isTrue) { + clickButtonToUpload(item, index, isTrue) { this.numIndex = index this.$refs.uploadFile.perentHandleFunc() this.$refs.uploadFile.visible = true this.uploadName = item let ids = '' console.log(index) - if (isTrue){ + if (isTrue) { ids = this.formInline.dataList[index][item] - }else{ + } else { ids = this.formInline[item] } getAction('sys/common/getFileInfos', { id: ids }).then((res) => { From ce39f8a46655c237af215077687fec85393e324b Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Mon, 3 Apr 2023 10:13:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?67731=20=E8=AE=A4=E8=AF=81=E6=B8=85?= =?UTF-8?q?=E5=8D=95=EF=BC=8C=E8=B0=83=E5=8F=96=E3=80=81=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BF=AE=E6=94=B9=E5=8E=86=E5=8F=B2=E3=80=82?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=95=BF=E5=BA=A6=E4=BF=AE=E6=94=B9SQL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 20 ++++++++++++- .../project/enums/OperatorTypeEnum.java | 2 ++ ...ctCertificationInventoryEOServiceImpl.java | 30 +++++++++++++++++++ 3 files changed, 51 insertions(+), 1 deletion(-) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index dec5fd18d..b39f68ad5 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -452,4 +452,22 @@ ALTER TABLE `project_version_info` -- 虚拟认证清单-增加字段 2023-3-30 未同步生产环境 ALTER TABLE `auth_dummy_inventory_info` - ADD COLUMN `deliverable_template` varchar(500) NULL COMMENT '交付物模板' AFTER `auth_dummy_inventory_base_id`; \ No newline at end of file + ADD COLUMN `deliverable_template` varchar(500) NULL COMMENT '交付物模板' AFTER `auth_dummy_inventory_base_id`; + +-- 项目库-认证清单，字段修改长度 2023-4-03 未同步生产环境 +ALTER TABLE `project_certification_inventory` + MODIFY COLUMN `category` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '类别' AFTER `sys_org_code`, + MODIFY COLUMN `inspection_item` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '检验项目' AFTER `category`, + MODIFY COLUMN `config_item` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '配置项' AFTER `inspection_item`, + MODIFY COLUMN `wvta_id` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'WVTA ID' AFTER `config_item`, + MODIFY COLUMN `report_number` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '报告编号' AFTER `flow_status`, + MODIFY COLUMN `product_model` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '产品型号' AFTER `report_number`, + MODIFY COLUMN `production_enterprise_name` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '生产企业名称' AFTER `product_model`; +-- 市场认证清单明细，字段修改长度 2023-4-03 未同步生产环境 +ALTER TABLE `auth_dummy_inventory_info` + MODIFY COLUMN `category` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '类别' AFTER `sys_org_code`, + MODIFY COLUMN `inspection_item` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '检验项目' AFTER `category`, + MODIFY COLUMN `config_item` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '配置项' AFTER `inspection_item`, + MODIFY COLUMN `wvta_id` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'WVTA ID' AFTER `config_item`, + MODIFY COLUMN `duty_territory` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '责任领域' AFTER `serial_number`, + MODIFY COLUMN `deliverable_template` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交付物模板' AFTER `auth_dummy_inventory_base_id`; \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java index a053a49f1..5d8c6f59e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java @@ -67,6 +67,8 @@ public enum OperatorTypeEnum { CERTIFICATION_INVENTORY_DUTY_PERSON_SUBMIT_TASK("认证清单-责任人提交任务","certificationInventoryDutyPersonSubmitTask"), CERTIFICATION_INVENTORY_REVIEW_THROUGH("认证清单-认证工程师审核通过","certificationInventoryReviewThrough"), CERTIFICATION_INVENTORY_REVIEW_RETURNED("认证清单-认证工程师审核退回","certificationInventoryReviewReturned"), + CERTIFICATION_INVENTORY_CALL_ADD("认证清单-调取添加","certificationInventoryCallAdd"), + CERTIFICATION_INVENTORY_IMPORT_ADD("认证清单-导入添加","certificationInventoryImportAdd"), /** * 项目库-法规清单 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 39445e708..df42fb0d9 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 @@ -2774,6 +2774,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl saveDataList = this.dataUniqueCheck(projectCertificationInventoryEOList, cut, result, projectLibraryId); this.saveBatch(saveDataList); + + // 设置历史log（修改历史） + this.saveProjectCertificationInventoryLog(saveDataList,OperatorTypeEnum.CERTIFICATION_INVENTORY_CALL_ADD.getValue()); + Date now = new Date(); //设置权限 先删后加 List adds = new ArrayList<>(); @@ -3067,6 +3071,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl