From a1dac17ee8cc65e9d5c438ccb477d05c29756650 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 27 Sep 2023 13:48:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6=E5=90=8E=EF=BC=8C=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=B1=95=E7=A4=BA=E5=B9=B3=E5=8F=B0=E4=BB=B6=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ctCertificationInventoryEOServiceImpl.java | 29 +++++++++++++++++--
 1 file changed, 26 insertions(+), 3 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 a583167ed..b84d9dd84 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
@@ -1986,14 +1986,18 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 							.map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).collect(Collectors.toList());
 					List<ProjectCertificationInventoryEO> certificationInventoryEOS = projectCertificationInventoryEOS.stream()
 							.filter(e -> idList.contains(e.getId())).collect(Collectors.toList());
-					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());
 					}
+
+					if(!certificationInventoryEOS.isEmpty()){
+						setProjectCertificationInventoryEO(certificationInventoryEOS.get(0),certificationInventoryEO);
+					}
+
+
 				}
 			}
 		}
@@ -7046,6 +7050,25 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 
 	private void setProjectCertificationInventoryEO(ProjectCertificationInventoryEO certificationInventoryEO,
 													ProjectCertificationInventoryEO projectCertificationInventoryEO) {
+		//类别  category
+		projectCertificationInventoryEO.setCategory(StringUtils.isNotEmpty(certificationInventoryEO.getCategory()) ? certificationInventoryEO.getCategory() : "");
+		//检验项目  inspectionItem
+		projectCertificationInventoryEO.setInspectionItem(StringUtils.isNotEmpty(certificationInventoryEO.getInspectionItem()) ? certificationInventoryEO.getInspectionItem() : "");
+		//认证类型  attestationType
+		projectCertificationInventoryEO.setAttestationType(StringUtils.isNotEmpty(certificationInventoryEO.getAttestationType()) ? certificationInventoryEO.getAttestationType() : "");
+		//WVTA ID  wvtaId
+		projectCertificationInventoryEO.setWvtaId(StringUtils.isNotEmpty(certificationInventoryEO.getWvtaId()) ? certificationInventoryEO.getWvtaId() : "");
+		//标准编号  serialNumber
+		projectCertificationInventoryEO.setSerialNumber(StringUtils.isNotEmpty(certificationInventoryEO.getSerialNumber()) ? certificationInventoryEO.getSerialNumber() : "");
+		//责任部门  dutyDepart
+		projectCertificationInventoryEO.setDutyDepart(StringUtils.isNotEmpty(certificationInventoryEO.getDutyDepart()) ? certificationInventoryEO.getDutyDepart() : "");
+		//责任领域  firstLevelDutyTerritory
+		projectCertificationInventoryEO.setFirstLevelDutyTerritory(StringUtils.isNotEmpty(certificationInventoryEO.getFirstLevelDutyTerritory()) ? certificationInventoryEO.getFirstLevelDutyTerritory() : "");
+		//工程接口人  sdt
+		projectCertificationInventoryEO.setSdt(StringUtils.isNotEmpty(certificationInventoryEO.getSdt()) ? certificationInventoryEO.getSdt() : "");
+		//责任人  dutyPerson
+		projectCertificationInventoryEO.setDutyPerson(StringUtils.isNotEmpty(certificationInventoryEO.getDutyPerson()) ? certificationInventoryEO.getDutyPerson() : "");
+
 		//交付物模板-deliverableTemplate
 		projectCertificationInventoryEO.setDeliverableTemplate(StringUtils.isNotEmpty(certificationInventoryEO.getDeliverableTemplate()) ? certificationInventoryEO.getDeliverableTemplate() : "");
 		//交付物类型-deliverableType