From 7244fe0ab9d8760371226deddec6f5dc8e26bc03 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 26 Sep 2023 17:11:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=E5=B1=95=E7=A4=BA=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E4=BB=B6=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...rojectCertificationInventoryEOServiceImpl.java | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

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 267c06211..ce0939d77 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
@@ -1957,6 +1957,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		}
 		for (ProjectCertificationInventoryEO certificationInventoryEO : result) {
 			if(!projectCertificationInventoryEOS.isEmpty()){
+				List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
 				List<LawsInventoryPlatformEO> collect = lawsInventoryPlatformEOList.stream()
 						.filter(e -> certificationInventoryEO.getId().equals(e.getLawsInventoryId())).collect(Collectors.toList());
 				if(ObjectUtils.isNotEmpty(collect)){
@@ -1966,6 +1967,15 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 					List<ProjectCertificationInventoryEO> inventoryEOList = projectCertificationInventoryEOS.stream()
 							.filter(e -> platformLawsInventoryIdList.contains(e.getId())).collect(Collectors.toList());
 					certificationInventoryEO.setProjectCertificationInventoryEOS(inventoryEOList);
+
+					if(ObjectUtils.isNotEmpty(inventoryEOList)){
+						List<String> projectLibraryIdList = inventoryEOList.stream()
+								.map(ProjectCertificationInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList());
+						LambdaQueryWrapper<ProjectLibraryBase> wrapper = new LambdaQueryWrapper<>();
+						wrapper.in(ProjectLibraryBase::getId,projectLibraryIdList);
+						projectLibraryBaseList = projectLibraryBaseService.list(wrapper);
+					}
+
 				}
 
 
@@ -1979,6 +1989,11 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 					if(!certificationInventoryEOS.isEmpty()){
 						setProjectCertificationInventoryEO(certificationInventoryEOS.get(0),certificationInventoryEO);
 					}
+					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());
+					}
 				}
 			}
 		}

From fea23ae5c4872e72e95fa8dc9c1024165df0947c Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 26 Sep 2023 17:19:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=9C=AA=E5=85=B3=E8=81=94=E5=88=B0=E5=B9=B3=E5=8F=B0=E4=BB=B6?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=EF=BC=88=E4=B8=AD=E8=8B=B1=E6=96=87?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectCertificationInventoryEOServiceImpl.java   | 7 ++++++-
 .../service/impl/ProjectLibraryBaseServiceImpl.java        | 7 ++++++-
 2 files changed, 12 insertions(+), 2 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 ce0939d77..a583167ed 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
@@ -7206,7 +7206,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				}
 				String serialNumber = projectCertificationInventoryEO.getSerialNumber();
 				String dutyTerritoryName = com.jero.modules.system.util.StringUtils.join(list,",");
-				String msg = serialNumber+" "+dutyTerritoryName+"未匹配到数据";
+				String msg = "";
+				if(CutEnum.CN.getValue().equals(cut)){
+					msg = serialNumber+" "+dutyTerritoryName+"未匹配到数据";
+				}else{
+					msg = serialNumber+" "+dutyTerritoryName+" no data matched";
+				}
 				msgList.add(msg);
 			}
 		}
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 ba55769c4..6d5f66965 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
@@ -1423,7 +1423,12 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 				}
 				String serialNumber = projectLawsInventoryEO.getSerialNumber();
 				String dutyTerritoryName = StringUtils.join(list,",");
-				String msg = serialNumber+" "+dutyTerritoryName+"未匹配到数据";
+				String msg = "";
+				if(CutEnum.CN.getValue().equals(cut)){
+					msg = serialNumber+" "+dutyTerritoryName+"未匹配到数据";
+				}else{
+					msg = serialNumber+" "+dutyTerritoryName+" no data matched";
+				}
 				msgList.add(msg);
 			}
 		}