From a4581a38e830832d588fb49f214ff5a8912e7a8f Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 20 Sep 2023 15:47:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=88=91=E4=B8=80=E6=9D=A1=E6=97=B6=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectLibraryBaseServiceImpl.java   | 33 +++++++++++++++++--
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index c48f84b1b..3aa0f273f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -23,6 +23,7 @@ import com.jero.modules.dummy.enums.OrderEnum;
 import com.jero.modules.enums.DictCodeEnum;
 import com.jero.modules.feishu.enums.TemplateInfoEnum2;
 import com.jero.modules.ota.service.impl.OtaManageApplyEOServiceImpl;
+import com.jero.modules.project.entity.LawsInventoryPlatformEO;
 import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
 import com.jero.modules.project.entity.ProjectLawsInventoryEO;
 import com.jero.modules.project.entity.ProjectLawsInventoryLogEO;
@@ -203,6 +204,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	private IProjectLibraryStatisticsService projectLibraryStatisticsService;
 	@Autowired
 	private OtaManageApplyEOServiceImpl otaManageApplyEOService;
+	@Autowired
+	private LawsInventoryPlatformEOServiceImpl lawsInventoryPlatformEOService;
 
 	private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 	private static DecimalFormat df = new DecimalFormat("#.00");
@@ -1294,12 +1297,15 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		//普通数据字典
 		List<SysDictItem> sysDictItemList = sysDictItemMapper.selectItemsByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue());
 		List<Map<String,Object>> mapList = new ArrayList<>();
+		List<Map<String,Object>> mapListOne = new ArrayList<>();
+		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = new ArrayList<>();
 		for (ProjectLawsInventoryEO projectLawsInventoryEO : lawsInventoryEOList) {
 			Map<String,Object> map = new HashMap<>();
 			List<ProjectLawsInventoryEO> projectLawsInventoryEOS = new ArrayList<>();
 			//serialNumber dutyTerritory
 			String serialNumber = projectLawsInventoryEO.getSerialNumber();
 			String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
+			String subtitle = projectLawsInventoryEO.getSubtitle();
 
 			//责任领域
 			List<String> list = new LinkedList<>();
@@ -1333,15 +1339,36 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 				}
 			}
 
-			if(!projectLawsInventoryEOS.isEmpty()){
+
+			if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() > 1){
 				map.put("lawsInventoryId",projectLawsInventoryEO.getId());
-				map.put("title",serialNumber+" "+dutyTerritoryNew+"在平台件项目中包含多条匹配内容，请选择关联");
+				map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+"在平台件项目中包含多条匹配内容，请选择关联");
 				map.put("result",projectLawsInventoryEOS);
 				mapList.add(map);
+			}else if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() == 1){
+				Map<String,Object> mapTemp = new HashMap<>();
+				mapTemp.put("lawsInventoryId",projectLawsInventoryEO.getId());
+				mapTemp.put("result",projectLawsInventoryEOS);
+				mapListOne.add(mapTemp);
 			}
 		}
+		if(!mapListOne.isEmpty()){
+			//匹配一条平台件时直接新增
+			List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = new ArrayList<>();
+			for (Map<String, Object> map : mapListOne) {
+				LawsInventoryPlatformEO inventoryPlatformEO = new LawsInventoryPlatformEO();
+				inventoryPlatformEO.setCreateTime(new Date());
+				inventoryPlatformEO.setUpdateTime(new Date());
+				inventoryPlatformEO.setLawsInventoryId((String) map.get("lawsInventoryId"));
+				List<ProjectLawsInventoryEO> projectLawsInventoryEOS = (List<ProjectLawsInventoryEO>) map.get("result");
+				inventoryPlatformEO.setPlatformLawsInventoryId(projectLawsInventoryEOS.get(0).getId());
+				lawsInventoryPlatformEOS.add(inventoryPlatformEO);
+			}
 
-
+			if (!lawsInventoryPlatformEOS.isEmpty()) {
+				lawsInventoryPlatformEOService.saveBatch(lawsInventoryPlatformEOS);
+			}
+		}
 		return mapList;
 	}