From 79bc3c85441e0bce8c81699dd9b3c42ff565d5c9 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 22 Sep 2023 17:20:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E6=9C=AA?=
 =?UTF-8?q?=E5=8C=B9=E9=85=8D=E5=88=B0=E5=B9=B3=E5=8F=B0=E4=BB=B6=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLibraryBaseController.java         |  4 +--
 .../service/IProjectLibraryBaseService.java   |  2 +-
 .../impl/ProjectLibraryBaseServiceImpl.java   | 36 +++++++++++++++++--
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
index ba98706f0..bea4e4c85 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
@@ -71,8 +71,8 @@ public class ProjectLibraryBaseController extends JeroController<ProjectLibraryB
 	@ApiOperation(value="勾选法规清单进行关联平台件", notes="勾选法规清单进行关联平台件")
 	@PostMapping(value = "/listPlatform")
 	public Result<?> listPlatform(@RequestBody Map<String,Object> params) {
-		List<Map<String, Object>> mapList = projectLibraryBaseService.listPlatform(params);
-		return Result.OK(params.get("cut").toString(),mapList);
+		Map<String, Object> map = projectLibraryBaseService.listPlatform(params);
+		return Result.OK(params.get("cut").toString(),map);
 	}
 	/**
 	 * 不勾选法规清单进行关联平台件
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java
index 4f9f6f60e..d6d57dbae 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java
@@ -91,7 +91,7 @@ public interface IProjectLibraryBaseService extends IService<ProjectLibraryBase>
 	 * @param params
 	 * @return
 	 */
-	List<Map<String,Object>> listPlatform(Map<String, Object> params);
+	Map<String,Object> listPlatform(Map<String, Object> params);
 
 	/**
 	 * 不勾选法规清单进行关联平台件
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 2f55167ee..6654e445d 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
@@ -1274,7 +1274,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	 * @return
 	 */
 	@Override
-	public List<Map<String,Object>> listPlatform(Map<String,Object> params) {
+	public Map<String,Object> listPlatform(Map<String,Object> params) {
 		String cut = (String) params.get("cut");//
 		String ids = (String) params.get("ids");//法规清单id
 		String projectLibraryIds = (String) params.get("projectLibraryIds");//平台件项目id
@@ -1303,6 +1303,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		List<SysCategory> categoryList = sysCategoryService.list();
 		List<Map<String,Object>> mapList = new ArrayList<>();
 		List<Map<String,Object>> mapListOne = new ArrayList<>();
+		List<ProjectLawsInventoryEO> emptyList = new ArrayList<>();
 		for (ProjectLawsInventoryEO projectLawsInventoryEO : lawsInventoryEOList) {
 			Map<String,Object> map = new HashMap<>();
 			List<ProjectLawsInventoryEO> projectLawsInventoryEOS = new ArrayList<>();
@@ -1360,6 +1361,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 					projectLawsInventoryEOS.add(lawsInventoryEO);
 				}
 			}
+			if(ObjectUtils.isEmpty(projectLawsInventoryEOS)){
+				emptyList.add(projectLawsInventoryEO);
+			}
 
 			if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() > 1){
 				map.put("lawsInventoryId",projectLawsInventoryEO.getId());
@@ -1373,6 +1377,31 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 				mapListOne.add(mapTemp);
 			}
 		}
+		List<String> msgList = new ArrayList<>();
+		//未匹配上法规清单
+		if(ObjectUtils.isNotEmpty(emptyList)){
+			for (ProjectLawsInventoryEO projectLawsInventoryEO : emptyList) {
+				List<String> list = new LinkedList<>();
+				if(StringUtils.isNotBlank(projectLawsInventoryEO.getDutyTerritory())){
+					for (String s : projectLawsInventoryEO.getDutyTerritory().split(",")) {
+						List<SysDictItem> collect = sysDictItemList.stream().filter(e -> e.getItemValue().equals(s)).collect(Collectors.toList());
+						if(CutEnum.CN.getValue().equals(cut) && !collect.isEmpty()){
+							list.add(collect.get(0).getItemText());
+						}else if(CutEnum.EN.getValue().equals(cut) && !collect.isEmpty()){
+							list.add(collect.get(0).getEnName());
+						}
+					}
+				}
+				String serialNumber = projectLawsInventoryEO.getSerialNumber();
+				String dutyTerritoryName = StringUtils.join(list,",");
+				String msg = serialNumber+" "+dutyTerritoryName+"未匹配到数据";
+				msgList.add(msg);
+			}
+		}
+		String html = "";
+		for (String s : msgList) {
+			html += s + "</br>";
+		}
 		if(!mapListOne.isEmpty()){
 			//匹配一条平台件时直接新增
 			List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = new ArrayList<>();
@@ -1390,7 +1419,10 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 				lawsInventoryPlatformEOService.saveBatch(lawsInventoryPlatformEOS);
 			}
 		}
-		return mapList;
+		Map<String,Object> map = new HashMap<>();
+		map.put("msg",html);
+		map.put("result",mapList);
+		return map;
 	}
 	/**
 	 * 不勾选法规清单进行关联平台件