Merge remote-tracking branch 'origin/dev_20230912_Platform' into dev_20230912_Platform

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

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java

@@ -11747,6 +11747,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 							List<ProjectLawsInventoryEO> collect = lawsInventoryEOS.stream()
 									.filter(e -> value.equals(e.getDesignFlowStatus())).collect(Collectors.toList());
 							if(ObjectUtils.isNotEmpty(collect)){
+								//流程状态
 								lawsInventoryEO.setDesignFlowStatus(value);
 								break;
 							}
@@ -11755,6 +11756,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 							List<ProjectLawsInventoryEO> collect = lawsInventoryEOS.stream()
 									.filter(e -> value.equals(e.getVerifyFlowStatus())).collect(Collectors.toList());
 							if(ObjectUtils.isNotEmpty(collect)){
+								//流程状态
 								lawsInventoryEO.setVerifyFlowStatus(value);
 								break;
 							}
@@ -11838,17 +11840,42 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						lawsInventoryEO.setVerifyDeliverableTemplate(lawsInventoryEOS.get(0).getVerifyDeliverableTemplate());
 						lawsInventoryEO.setVerifyDeliverableTemplateName(lawsInventoryEOS.get(0).getVerifyDeliverableTemplateName());
 
+						//责任人
 						lawsInventoryEO.setVerifyDutyId(lawsInventoryEOS.get(0).getDesignDutyId());
 						lawsInventoryEO.setDesignDutyIdName(lawsInventoryEOS.get(0).getDesignDutyIdName());
 
 						lawsInventoryEO.setVerifyDutyId(lawsInventoryEOS.get(0).getVerifyDutyId());
 						lawsInventoryEO.setVerifyDutyIdName(lawsInventoryEOS.get(0).getVerifyDutyIdName());
 
+						//截止时间
 						lawsInventoryEO.setDesignDueDate(lawsInventoryEOS.get(0).getDesignDueDate());
 						lawsInventoryEO.setVerifyDueDate(lawsInventoryEOS.get(0).getVerifyDueDate());
 
+						//交付物说明
 						lawsInventoryEO.setDesignRemark(lawsInventoryEOS.get(0).getDesignRemark());
 						lawsInventoryEO.setVerifyRemark(lawsInventoryEOS.get(0).getVerifyRemark());
+						//编号  serialNumber
+						lawsInventoryEO.setSerialNumber(lawsInventoryEOS.get(0).getSerialNumber());
+						//标题  title
+						lawsInventoryEO.setTitle(lawsInventoryEOS.get(0).getTitle());
+						//子标题  subtitle
+						lawsInventoryEO.setSubtitle(lawsInventoryEOS.get(0).getSubtitle());
+						//使用增补件  applicableSupplement
+						lawsInventoryEO.setApplicableSupplement(lawsInventoryEOS.get(0).getApplicableSupplement());
+						//认证类型  attestationType
+						lawsInventoryEO.setAttestationType(lawsInventoryEOS.get(0).getAttestationType());
+						//认证级别  attestationRank
+						lawsInventoryEO.setAttestationRank(lawsInventoryEOS.get(0).getAttestationRank());
+						//责任部门  dutyDepart
+						lawsInventoryEO.setDutyDepart(lawsInventoryEOS.get(0).getDutyDepart());
+						//责任领域  dutyTerritory
+						lawsInventoryEO.setDutyTerritory(lawsInventoryEOS.get(0).getDutyTerritory());
+						//法规工程师  regulationOwnerId
+						lawsInventoryEO.setRegulationOwnerId(lawsInventoryEOS.get(0).getRegulationOwnerId());
+						//工程接口人  engineeringInterfacePerson
+						lawsInventoryEO.setEngineeringInterfacePerson(lawsInventoryEOS.get(0).getEngineeringInterfacePerson());
+						//备注  remark
+						lawsInventoryEO.setRemark(lawsInventoryEOS.get(0).getRemark());
 					}
 				}
 			}