Merge remote-tracking branch 'origin/dev_20230912_Platform' into fix_20230911_UAT

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`;

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<String> list = Arrays.asList(value.split(","));
+					List<SysDictItem> ddList = dictItemList.stream().filter(e -> "duty_territory".equals(e.getDictCode()) && list.contains(e.getItemValue())).collect(Collectors.toList());
+					List<String> valueList = ddList.stream().map(SysDictItem::getStatNode).collect(Collectors.toList());
+					projectCertificationInventoryEO.setDutyDepart(StringUtils.join(valueList,","));
+
 				}
 			}
 			//工程接口人(责任领域下的工程接口人)

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<Platf
 			flag = must(projectLawsInventoryEO, errorMsg, msgList, dutyTerritory, "责任领域", "Responsible Field");
 			if (flag) {
 				value = pullMore(dictItemList, projectLawsInventoryEO, errorMsg, dutyTerritory, msgList, "责任领域", "Responsible Field", DicCodeEnum.DUTY_TERRITORY.getCode());
+
+				if(StringUtils.isNotBlank(value)){
+					projectLawsInventoryEO.setDutyTerritory(value);
+					List<String> list = Arrays.asList(value.split(","));
+					List<SysDictItem> ddList = dictItemList.stream().filter(e -> "duty_territory".equals(e.getDictCode()) && list.contains(e.getItemValue())).collect(Collectors.toList());
+					List<String> valueList = ddList.stream().map(SysDictItem::getStatNode).collect(Collectors.toList());
+					projectLawsInventoryEO.setDutyDepart(StringUtils.join(valueList,","));
+				}
+
 				if (StringUtils.isNotBlank(value)) {
 					//工程接口人(责任领域下的工程接口人)
 					Map<String, Object> objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectLawsInventoryEOTemp.getProjectLibraryId(), value);

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<Proj
 				value = pullMore(dictItemList, projectCertificationInventoryEO, errorMsg, dutyTerritory,msgList,"责任领域","Responsible Field","duty_territory");
 				if(StringUtils.isNotBlank(value)){
 					projectCertificationInventoryEO.setDutyTerritory(value);
+					List<String> list = Arrays.asList(value.split(","));
+					List<SysDictItem> ddList = dictItemList.stream().filter(e -> "duty_territory".equals(e.getDictCode()) && list.contains(e.getItemValue())).collect(Collectors.toList());
+					List<String> valueList = ddList.stream().map(SysDictItem::getStatNode).collect(Collectors.toList());
+					projectCertificationInventoryEO.setDutyDepart(StringUtils.join(valueList,","));
 				}
 			}
 			//工程接口人(责任领域下的工程接口人)

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<ProjectLawsIn
 			if (flag) {
 				value = pullMore(dictItemList, projectLawsInventoryEO, errorMsg, dutyTerritory, msgList, "责任领域", "Responsible Field", DicCodeEnum.DUTY_TERRITORY.getCode());
 				if (StringUtils.isNotBlank(value)) {
+					List<String> list = Arrays.asList(value.split(","));
+					List<SysDictItem> ddList = dictItemList.stream().filter(e -> "duty_territory".equals(e.getDictCode()) && list.contains(e.getItemValue())).collect(Collectors.toList());
+					List<String> valueList = ddList.stream().map(SysDictItem::getStatNode).collect(Collectors.toList());
+					projectLawsInventoryEO.setDutyDepart(StringUtils.join(valueList,","));
+
 					//工程接口人(责任领域下的工程接口人)
 					Map<String, Object> objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectLawsInventoryEOTemp.getProjectLibraryId(), value);
 

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',

jero-web/src/common/lang/zh-cn.js

@@ -2622,7 +2622,7 @@ module.exports = {
   dataConfirmation: '请选择清单确认状态为未发起或拒绝的数据,以及法规工程师、认证工程师不为空',
   pleaseSelectinitiatedOrRejected: '请选择设计符合性确认流程状态为清单待发布、法规工程师退回或验证符合性确认流程状态为清单待发布、法规工程师退回的数据',
   pleaseSelectTheDataverificationVerified: '请选择设计符合性确认流程状态为清单待校核、责任人拒绝或验证符合性确认流程状态为清单待校核、责任人拒绝的数据',
-  pleaseSelectTheDataverification: '请选择设计符合性确认流程状态为任务待发起、责任人拒绝或验证符合性确认流程状态为清单待校核、责任人拒绝的数据',
+  pleaseSelectTheDataverification: '请选择设计符合性确认流程状态为任务待发起、责任人拒绝或验证符合性确认流程状态为任务待发起、责任人拒绝的数据',
   TheEngineerAndCertification: '的法规工程师不能为空',
   taskDataConfirmation: '请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据,以及工程接口人不为空',
   theProjectContactEmpty: '的工程接口人不能为空',

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() {