Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

jero-boot/db/蔚来标准sql/dev_2nd_period.sql

@@ -453,3 +453,21 @@ 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`;
+
+-- 项目库-认证清单，字段修改长度  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`;

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"),
 
     /**
      * 项目库-法规清单

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<Proj
 			List<ProjectCertificationInventoryEO> 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<ProjectUserPermission> adds = new ArrayList<>();
@@ -3067,6 +3071,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		}else {
 			if (datas.size() != 0) {
 				this.saveBatch(datas);
+
+				this.saveProjectCertificationInventoryLog(datas,OperatorTypeEnum.CERTIFICATION_INVENTORY_IMPORT_ADD.getValue());
 			}
 		}
 	}
@@ -4243,6 +4249,30 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_WITHDRAW.getValue())){
 					contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("从").append("\"").append(certificationEngineerUserNames).append("\"撤回了流程");
 					contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" withdrew the process from \"").append(certificationEngineerUserNames).append("\"");
+				} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_CALL_ADD.getValue())){
+					contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 ");
+					contentCnSb.append("\"").append(pci.getCategory()).append("\"").append(" ");
+					contentCnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" ");
+					contentCnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" ");
+					contentCnSb.append("\"").append(pci.getSerialNumber()).append("\"").append(" ");
+
+					contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" added ");
+					contentEnSb.append("\"").append(pci.getCategory()).append("\"").append(" ");
+					contentEnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" ");
+					contentEnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" ");
+					contentEnSb.append("\"").append(pci.getSerialNumber()).append("\"");
+				} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_IMPORT_ADD.getValue())){
+					contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 ");
+					contentCnSb.append("\"").append(pci.getCategory()).append("\"").append(" ");
+					contentCnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" ");
+					contentCnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" ");
+					contentCnSb.append("\"").append(pci.getSerialNumber()).append("\"").append(" ");
+
+					contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" added ");
+					contentEnSb.append("\"").append(pci.getCategory()).append("\"").append(" ");
+					contentEnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" ");
+					contentEnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" ");
+					contentEnSb.append("\"").append(pci.getSerialNumber()).append("\"");
 				}
 
 				ProjectCertificationInventoryLogEO pciLogEO = new ProjectCertificationInventoryLogEO();

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'},]"
                     >
+                      <!--
+                       :maxTagCount="1"
+                       tree-checkable-->
                       <a-tree-select
                         tree-node-filter-prop="title"
                         v-model="item.deliverableType"
-                        :maxTagCount="1"
                         :getPopupContainer="triggerNode=> triggerNode.parentNode"
                         class="box-input"
                         style="width: 100%"
                         :tree-data="DeliverableTreeList"
-                        tree-checkable
                         :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
                       />
                     </a-form-model-item>
@@ -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) => {