From 56fee24a95c8791aea8c0f97d7d8f968450a7fb2 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 18 Oct 2023 13:42:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8=E5=B9=B3=E5=8F=B0=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ctCertificationInventoryEOServiceImpl.java | 22 +++++++++++++++----
 .../ProjectLawsInventoryEOServiceImpl.java    |  2 +-
 2 files changed, 19 insertions(+), 5 deletions(-)

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 b51d8e4c3..eec94df0b 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
@@ -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();
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 71b59f1d9..67d3b0058 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
@@ -12406,7 +12406,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						if(!collect.isEmpty()){
 							//目标市场
 							String targetMarket = DictItemUtil.getDictItemText(cut,collect.get(0).getTargetMarket(),targetMarketList);
-							String projectName = collect.get(0).getPower()+collect.get(0).getProducer() + targetMarket;
+							String projectName = collect.get(0).getPower() + "-" + collect.get(0).getProducer() + "-" + targetMarket;
 							inventoryEO.setProjectName(projectName);
 						}
 					}