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

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

@@ -1301,3 +1301,11 @@ INSERT INTO `platform_task_planning`(`id`, `create_by`, `create_time`, `update_b
 INSERT INTO `platform_task_planning`(`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `node_name`, `node_time`, `project_id`, `flag`) VALUES ('e76e63a251aa6d64cac96125315805e1', NULL, NULL, NULL, NULL, NULL, 'CAMDS提交（CDF前）', NULL, NULL, 'down');
 INSERT INTO `platform_task_planning`(`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `node_name`, `node_time`, `project_id`, `flag`) VALUES ('ee85c1b1964586e512ef0b2b401b16b5', NULL, NULL, NULL, NULL, NULL, '验证检查（ESO）', NULL, NULL, 'down');
 
+--平台件合规认证计划初始化数据->合规管理阀点相关字段初始化值修改  2023-10-18
+UPDATE `platform_task_planning` SET `create_by` = NULL, `create_time` = NULL, `update_by` = NULL, `update_time` = NULL, `sys_org_code` = NULL, `node_name` = '法规清单', `node_time` = NULL, `project_id` = NULL, `flag` = 'down' WHERE `id` = '85fa6eb0b58d93d4cc76b8fb1d5248ca';
+UPDATE `platform_task_planning` SET `create_by` = NULL, `create_time` = NULL, `update_by` = NULL, `update_time` = NULL, `sys_org_code` = NULL, `node_name` = '责任确认', `node_time` = NULL, `project_id` = NULL, `flag` = 'down' WHERE `id` = '97aaf07d156b6a4278e0ac3627566c8b';
+UPDATE `platform_task_planning` SET `create_by` = NULL, `create_time` = NULL, `update_by` = NULL, `update_time` = NULL, `sys_org_code` = NULL, `node_name` = '设计核查', `node_time` = NULL, `project_id` = NULL, `flag` = 'down' WHERE `id` = 'a533416284ab81c7f6ee95b5e9e06d38';
+UPDATE `platform_task_planning` SET `create_by` = NULL, `create_time` = NULL, `update_by` = NULL, `update_time` = NULL, `sys_org_code` = NULL, `node_name` = '强检报告', `node_time` = NULL, `project_id` = NULL, `flag` = 'down' WHERE `id` = 'cd7d6332a42dd3855f0117ffb188f5b1';
+UPDATE `platform_task_planning` SET `create_by` = NULL, `create_time` = NULL, `update_by` = NULL, `update_time` = NULL, `sys_org_code` = NULL, `node_name` = 'E-mark', `node_time` = NULL, `project_id` = NULL, `flag` = 'down' WHERE `id` = 'e611b793756bf9caeb4a1c09526ceb76';
+UPDATE `platform_task_planning` SET `create_by` = NULL, `create_time` = NULL, `update_by` = NULL, `update_time` = NULL, `sys_org_code` = NULL, `node_name` = 'CAMDS提交', `node_time` = NULL, `project_id` = NULL, `flag` = 'down' WHERE `id` = 'e76e63a251aa6d64cac96125315805e1';
+UPDATE `platform_task_planning` SET `create_by` = NULL, `create_time` = NULL, `update_by` = NULL, `update_time` = NULL, `sys_org_code` = NULL, `node_name` = '验证检查', `node_time` = NULL, `project_id` = NULL, `flag` = 'down' WHERE `id` = 'ee85c1b1964586e512ef0b2b401b16b5';

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/DictItemUtil.java

@@ -0,0 +1,43 @@
+package com.jero.modules.system.util;
+
+import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.system.vo.DictModel;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @description
+ * @date 2023/10/18 10:59
+ * @auth zhn
+ */
+public class DictItemUtil {
+    public static String getDictItemText(String cut, String value, List<DictModel> dictModelAll) {
+        if (StringUtils.isBlank(value)) {
+            return "";
+        }
+        List<DictModel> dictModelList = new ArrayList<>();
+        for (String s : value.split(",")) {
+            List<DictModel> dictModelListTemp = dictModelAll.stream()
+                    .filter(e -> s.equals(e.getValue())).collect(Collectors.toList());
+            dictModelList.addAll(dictModelListTemp);
+        }
+        String targetMarket = "";
+        if (dictModelList.size() != 0) {
+            StringBuilder sb = new StringBuilder();
+            for (DictModel dictModel : dictModelList) {
+                if (CutEnum.CN.getValue().equals(cut)) {
+                    sb.append(dictModel.getText() + ",");
+                } else {
+                    sb.append(dictModel.getTextEn() + ",");
+                }
+            }
+            if (com.jero.modules.system.util.StringUtils.isNotBlank(sb)) {
+                targetMarket = sb.substring(0, sb.length() - 1);
+            }
+        }
+        return targetMarket;
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java

@@ -16,6 +16,7 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.query.QueryGenerator;
+import com.jero.common.system.vo.DictModel;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.DateUtils;
 import com.jero.common.util.oss.CosBootUtil;
@@ -69,6 +70,7 @@ import com.jero.modules.system.entity.SysCategory;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.entity.SysRole;
 import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.enums.DicCodeEnum;
 import com.jero.modules.system.enums.ProjectRoleEnum;
 import com.jero.modules.system.enums.SysCategoryValueTypeEnum;
 import com.jero.modules.system.mapper.SysCategoryMapper;
@@ -78,8 +80,10 @@ import com.jero.modules.system.mapper.SysUserMapper;
 import com.jero.modules.system.service.IProjectUserDutyTerritoryService;
 import com.jero.modules.system.service.ISysCategoryService;
 import com.jero.modules.system.service.ISysDictItemService;
+import com.jero.modules.system.service.ISysDictService;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
+import com.jero.modules.system.util.DictItemUtil;
 import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
 import com.jero.modules.todoCenter.entity.ProcessInfoEO;
 import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService;
@@ -203,6 +207,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 
 	@Autowired
 	private ProjectLibraryBaseMapper projectLibraryBaseMapper;
+	@Autowired
+	private ISysDictService sysDictService;
 
 
 	@Value(value = "${jero.backUrl}")
@@ -1928,7 +1934,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		}
 		IPage<ProjectCertificationInventoryEO> pageList = this.page(page, queryWrapper);
 		//平台件数据处理
-		platformDispose(projectCertificationInventoryEO, pageList.getRecords());
+		platformDispose(cut,projectCertificationInventoryEO, pageList.getRecords());
 
 
 
@@ -1937,9 +1943,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		pageList.setRecords(records);
 		return pageList;
 	}
-	private void platformDispose(ProjectCertificationInventoryEO projectCertificationInventoryEO, List<ProjectCertificationInventoryEO> result) {
+	private void platformDispose(String cut,ProjectCertificationInventoryEO projectCertificationInventoryEO, List<ProjectCertificationInventoryEO> result) {
 		List<LawsInventoryPlatformEO> lawsInventoryPlatformEOList = new ArrayList<>();
 		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOS = new ArrayList<>();
+		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
 
 		if(!result.isEmpty()){
 			//认证清单ID
@@ -1989,7 +1996,11 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 					List<ProjectLibraryBase> libraryBaseList = projectLibraryBaseList.stream()
 							.filter(e -> certificationInventoryEOS.get(0).getProjectLibraryId().equals(e.getId())).collect(Collectors.toList());
 					if(ObjectUtils.isNotEmpty(libraryBaseList)){
-						certificationInventoryEO.setConfigItem(libraryBaseList.get(0).getProjectNameId());
+						String dictItemText = DictItemUtil.getDictItemText(cut, libraryBaseList.get(0).getTargetMarket(), targetMarketList);
+						String configItem = libraryBaseList.get(0).getPower()+"-"+libraryBaseList.get(0).getProducer()+"-"+dictItemText;
+
+						certificationInventoryEO.setConfigItem(configItem);
+//						certificationInventoryEO.setConfigItem(libraryBaseList.get(0).getProjectNameId());
 					}
 
 					if(!certificationInventoryEOS.isEmpty()){
@@ -7156,6 +7167,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		String cut = (String) params.get("cut");//
 		String ids = (String) params.get("ids");//认证清单id
 		String projectLibraryIds = (String) params.get("projectLibraryIds");//平台件项目id
+		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
 
 		//认证清单数据
 		LambdaQueryWrapper<ProjectCertificationInventoryEO> wrapper = new LambdaQueryWrapper<>();
@@ -7204,7 +7216,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				String configItemTemp = "";
 				if(!libraryBaseList.isEmpty()){
 					//配置项
-					configItemTemp = libraryBaseList.get(0).getProjectNameId();
+					String dictItemText = DictItemUtil.getDictItemText(cut,libraryBaseList.get(0).getTargetMarket(),targetMarketList);
+					configItemTemp = libraryBaseList.get(0).getPower() + "-" + libraryBaseList.get(0).getProducer() + "-" + dictItemText;
+//					configItemTemp = libraryBaseList.get(0).getProjectNameId();
 				}
 				//类别
 				String categoryTemp = certificationInventoryEO.getCategory();

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java

@@ -129,6 +129,7 @@ import com.jero.modules.system.service.ISysDictService;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
 import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
+import com.jero.modules.system.util.DictItemUtil;
 import com.jero.modules.system.util.PDFUtils;
 import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
 import com.jero.modules.todoCenter.entity.ProcessInfoEO;
@@ -12352,7 +12353,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						lawsInventoryEO.setVerifyDeliverableTemplateName(lawsInventoryEOS.get(0).getVerifyDeliverableTemplateName());
 
 						//责任人
-						lawsInventoryEO.setVerifyDutyId(lawsInventoryEOS.get(0).getDesignDutyId());
+						lawsInventoryEO.setDesignDutyId(lawsInventoryEOS.get(0).getDesignDutyId());
 						lawsInventoryEO.setDesignDutyIdName(lawsInventoryEOS.get(0).getDesignDutyIdName());
 
 						lawsInventoryEO.setVerifyDutyId(lawsInventoryEOS.get(0).getVerifyDutyId());
@@ -12391,6 +12392,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 			}
 		}
+		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
 		if(!projectLawsInventoryEOList.isEmpty()){
 			List<String> projectLibraryIdList = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList());
 			LambdaQueryWrapper<ProjectLibraryBase> wrapper = new LambdaQueryWrapper<>();
@@ -12402,7 +12404,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					for (ProjectLawsInventoryEO inventoryEO : lawsInventoryEOS) {
 						List<ProjectLibraryBase> collect = libraryBaseList.stream().filter(e -> inventoryEO.getProjectLibraryId().equals(e.getId())).collect(Collectors.toList());
 						if(!collect.isEmpty()){
-							inventoryEO.setProjectName(collect.get(0).getProjectNameId());
+							//目标市场
+							String targetMarket = DictItemUtil.getDictItemText(cut,collect.get(0).getTargetMarket(),targetMarketList);
+							String projectName = collect.get(0).getPower() + "-" + collect.get(0).getProducer() + "-" + targetMarket;
+							inventoryEO.setProjectName(projectName);
 						}
 					}
 				}

jero-web/src/views/projectManagement/projectStatusBoard/components/statistics.vue

@@ -775,7 +775,8 @@
       },
 
       getoptions() {
-        getAction('project/projectLibraryBase/getProjectDetailsStatisticsCollectManifestLabel', { id: this.projectQuery.projectId }).then((res) => {
+        getAction('project/projectLibraryBase/getProjectDetailsStatisticsCollectManifestLabel',
+          { id: this.projectInfo.parentId ,projectVersion:this.projectInfo.projectVersion}).then((res) => {
           if (res.success) {
             this.options = res.result
             this.queryParam.ctype = this.options[0].value