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

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java

@@ -4553,11 +4553,11 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 	public void importData(MultipartFile file, ProjectCertificationInventoryEO projectCertificationInventoryEO) {
 		String title = "";
 		if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
-			title = "*类别,*检验项目,*配置项,*认证类型,*WVTA ID," +
+			title = "*类别,*检验项目,*认证类型,*WVTA ID," +
 					"*标准编号,*责任领域,*工程接口人,*责任人," +
 					"交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称";
 		}else {
-			title = "*Category,*Inspection Items,*Configuration Item,*Certification Type,*WVTA ID," +
+			title = "*Category,*Inspection Items,*Certification Type,*WVTA ID," +
 					"*Standard No,*Responsible Field,*Eng. Interface,*Assignee," +
 					"Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer";
 		}
@@ -4675,7 +4675,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 								if (i == 0) {
 									cell.setCellType(HSSFCell.CELL_TYPE_STRING);
 									headerSb.append(cell.getStringCellValue() + ",");
-									if(j == 15){
+									if(j == 14){
 										break;
 									}
 								} else if(i > 1){
@@ -4719,7 +4719,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 						ProjectCertificationInventoryEO projectCertificationInventoryEOTemp = JSON.parseObject(JSON.toJSONString(stringStringMap), ProjectCertificationInventoryEO.class);
 						projectCertificationInventoryEOTemp.setCut(projectCertificationInventoryEO.getCut());
 						projectCertificationInventoryEOTemp.setProjectLibraryId(projectCertificationInventoryEO.getProjectLibraryId());
-						projectCertificationInventoryEOTemp.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+						projectCertificationInventoryEOTemp.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
 						projectCertificationInventoryEOTemp.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue());
 						datas.add(projectCertificationInventoryEOTemp);
 					}
@@ -4746,7 +4746,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 					for(int k = 0 ; k <datas.size(); k++){
 						if(((datas.get(k).getCategory() == null)||(StringUtils.equals("",datas.get(k).getCategory()))) ||
 								((datas.get(k).getInspectionItem() == null)||(StringUtils.equals("",datas.get(k).getInspectionItem()))) ||
-								((datas.get(k).getConfigItem() == null)||(StringUtils.equals("",datas.get(k).getConfigItem()))) ||
+//								((datas.get(k).getConfigItem() == null)||(StringUtils.equals("",datas.get(k).getConfigItem()))) ||
 								((datas.get(k).getWvtaId() == null)||(StringUtils.equals("",datas.get(k).getWvtaId()))) ||
 								((datas.get(k).getSerialNumber() == null)||(StringUtils.equals("",datas.get(k).getSerialNumber()))) ||
 								((datas.get(k).getDutyTerritoryName() == null)||(StringUtils.equals("",datas.get(k).getDutyTerritoryName()))) ||
@@ -4767,7 +4767,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 					for(int k = 0 ; k <datas.size(); k++){
 						if(((datas.get(k).getCategory() == null)||(StringUtils.equals("",datas.get(k).getCategory()))) ||
 								((datas.get(k).getInspectionItem() == null)||(StringUtils.equals("",datas.get(k).getInspectionItem()))) ||
-								((datas.get(k).getConfigItem() == null)||(StringUtils.equals("",datas.get(k).getConfigItem()))) ||
+//								((datas.get(k).getConfigItem() == null)||(StringUtils.equals("",datas.get(k).getConfigItem()))) ||
 								((datas.get(k).getWvtaId() == null)||(StringUtils.equals("",datas.get(k).getWvtaId()))) ||
 								((datas.get(k).getSerialNumber() == null)||(StringUtils.equals("",datas.get(k).getSerialNumber()))) ||
 								((datas.get(k).getDutyTerritoryName() == null)||(StringUtils.equals("",datas.get(k).getDutyTerritoryName()))) ||
@@ -4866,6 +4866,21 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 
 		//编号验证
 		verifySerialNumber(datas,projectCertificationInventoryEOTemp);
+
+		List<String> userIdList = new ArrayList<>();
+		if(ObjectUtils.isNotEmpty(datas)){
+			//sdtName
+			List<String> collect1 = datas.stream().filter(e -> StringUtils.isNotBlank(e.getSdtName()))
+					.map(ProjectCertificationInventoryEO::getSdtName).distinct().collect(Collectors.toList());
+			if(ObjectUtils.isNotEmpty(collect1)){
+				userIdList.addAll(collect1);
+			}
+		}
+		List<SysUser> userList = new ArrayList<>();
+		if(ObjectUtils.isNotEmpty(userIdList)){
+			userList = sysUserService.queryUserIdListByNameList(userIdList);
+		}
+
 		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : datas) {
 			i++;
 			String errorMsg = "";
@@ -4992,7 +5007,9 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 				nameCn = "工程接口人";
 				nameEn = "Eng. Interface ";
 				//验证人员是否存在
-				personnelVerify(projectCertificationInventoryEO, errorMsg, msgList, sdt, mapPersonList,nameCn,nameEn, com.jero.modules.project.enums.ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue());
+				List<SysUser> sysUsers = userList.stream().filter(e -> sdt.equals(e.getUsername())).collect(Collectors.toList());
+				personnelVerify(projectCertificationInventoryEO, errorMsg, msgList, sdt, sysUsers,nameCn,nameEn, com.jero.modules.project.enums.ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue());
+//				personnelVerify(projectCertificationInventoryEO, errorMsg, msgList, sdt, mapPersonList,nameCn,nameEn, com.jero.modules.project.enums.ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue());
 			}
 
 			//责任人
@@ -5294,7 +5311,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 	}
 	private void personnelVerify(ProjectCertificationInventoryEO projectCertificationInventoryEO,
 								 String errorMsg, List<String> msgList, String regulationOwnerId,
-								 List<Map<String, String>> mapList, String nameCn, String nameEn, String fieldNumber) {
+								 List<SysUser> sysUserList, String nameCn, String nameEn, String fieldNumber) {
 		//单选
 		if(regulationOwnerId.contains(",")){
 			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
@@ -5305,35 +5322,61 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 			msgList.add(errorMsg);
 		}
 
-		if(mapList.size() != 0){
+		if(ObjectUtils.isNotEmpty(sysUserList)){
-			int count = 0;
+			if(com.jero.modules.project.enums.ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue().equals(fieldNumber)){
-			for (Map<String, String> stringStringMap : mapList) {
+				projectCertificationInventoryEO.setSdt(sysUserList.get(0).getId());
-				String name = stringStringMap.get("name");
-				if(regulationOwnerId.equals(name)){
-					count ++;
-					if(com.jero.modules.project.enums.ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue().equals(fieldNumber)){
-						projectCertificationInventoryEO.setSdt(stringStringMap.get("value"));
-					}
-					break;
-				}
-			}
-			if(count == 0){
-				if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
-					errorMsg += nameCn+regulationOwnerId+"与相关人员名单中责任领域下的人员不匹配";
-				}else{
-					errorMsg += nameEn+regulationOwnerId+"does not match a person under the Responsible Field in the relevant person list";
-				}
-				msgList.add(errorMsg);
 			}
 		}else{
 			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
-				errorMsg += nameCn+regulationOwnerId+"与相关人员名单中责任领域下的人员不匹配";
+				errorMsg += nameCn+regulationOwnerId+"不存在";
 			}else{
-				errorMsg += nameEn+regulationOwnerId+"does not match a person under the Responsible Field in the relevant person list";
+				errorMsg += nameEn+regulationOwnerId+"absent";
 			}
 			msgList.add(errorMsg);
 		}
 	}
+//	private void personnelVerify(ProjectCertificationInventoryEO projectCertificationInventoryEO,
+//								 String errorMsg, List<String> msgList, String regulationOwnerId,
+//								 List<Map<String, String>> mapList, String nameCn, String nameEn, String fieldNumber) {
+//		//单选
+//		if(regulationOwnerId.contains(",")){
+//			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+//				errorMsg += nameCn + "导入只能填写一个用户名";
+//			}else{
+//				errorMsg += "Only one user name can be entered for"+ nameEn +"import";
+//			}
+//			msgList.add(errorMsg);
+//		}
+//
+//		if(mapList.size() != 0){
+//			int count = 0;
+//			for (Map<String, String> stringStringMap : mapList) {
+//				String name = stringStringMap.get("name");
+//				if(regulationOwnerId.equals(name)){
+//					count ++;
+//					if(com.jero.modules.project.enums.ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue().equals(fieldNumber)){
+//						projectCertificationInventoryEO.setSdt(stringStringMap.get("value"));
+//					}
+//					break;
+//				}
+//			}
+//			if(count == 0){
+//				if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+//					errorMsg += nameCn+regulationOwnerId+"与相关人员名单中责任领域下的人员不匹配";
+//				}else{
+//					errorMsg += nameEn+regulationOwnerId+"does not match a person under the Responsible Field in the relevant person list";
+//				}
+//				msgList.add(errorMsg);
+//			}
+//		}else{
+//			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+//				errorMsg += nameCn+regulationOwnerId+"与相关人员名单中责任领域下的人员不匹配";
+//			}else{
+//				errorMsg += nameEn+regulationOwnerId+"does not match a person under the Responsible Field in the relevant person list";
+//			}
+//			msgList.add(errorMsg);
+//		}
+//	}
 
 	private String pullMore(List<SysDictItem> dictItemList, ProjectCertificationInventoryEO projectCertificationInventoryEO,
 							String errorMsg, String value, List<String> msgList,

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java

@@ -5440,6 +5440,24 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 		userNameList.addAll(Arrays.asList(verifyDutyIds.split(",")));
 		List<SysUser> sysUserList = this.sysUserService.querySysUserByUserNameList(userNameList);
 
+		List<String> userIdList = new ArrayList<>();
+		if(ObjectUtils.isNotEmpty(dataList)){
+			//regulationOwnerId  engineeringInterfacePerson
+			List<String> collect1 = dataList.stream().filter(e -> StringUtils.isNotBlank(e.getRegulationOwnerId()))
+					.map(ProjectLawsInventoryEO::getRegulationOwnerId).distinct().collect(Collectors.toList());
+			List<String> collect2 = dataList.stream().filter(e -> StringUtils.isNotBlank(e.getEngineeringInterfacePerson()))
+					.map(ProjectLawsInventoryEO::getEngineeringInterfacePerson).distinct().collect(Collectors.toList());
+			if(ObjectUtils.isNotEmpty(collect1)){
+				userIdList.addAll(collect1);
+			}
+			if(ObjectUtils.isNotEmpty(collect2)){
+				userIdList.addAll(collect2);
+			}
+		}
+		List<SysUser> userList = new ArrayList<>();
+		if(ObjectUtils.isNotEmpty(userIdList)){
+			userList = sysUserService.queryUserIdListByNameList(userIdList);
+		}
 		//编号验证
 		verifySerialNumber(dataList, projectLawsInventoryEOTemp, dataSource);
 		for (ProjectLawsInventoryEO projectLawsInventoryEO : dataList) {
@@ -5594,8 +5612,9 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 					if (StringUtils.isNotBlank(regulationOwnerId)) {
 						nameCn = "法规工程师";
 						nameEn = "regulatory engineer";
+						List<SysUser> sysUsers = userList.stream().filter(e -> regulationOwnerId.equals(e.getUsername())).collect(Collectors.toList());
 						//验证人员是否存在
-						personnelVerify(projectLawsInventoryEO, errorMsg, msgList, regulationOwnerId, mapLawList, nameCn, nameEn, ProjectRoleEnum.REGULATI_ENGINEER.getValue());
+						personnelVerifyTemp(projectLawsInventoryEO, errorMsg, msgList, regulationOwnerId, sysUsers, nameCn, nameEn, ProjectRoleEnum.REGULATI_ENGINEER.getValue());
 					}
 
 					//认证工程师
@@ -5611,7 +5630,10 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 						nameCn = "工程接口人";
 						nameEn = "Engineering Interface ";
 						//验证人员是否存在
-						personnelVerify(projectLawsInventoryEO, errorMsg, msgList, engineeringInterfacePerson, mapPersonList, nameCn, nameEn, ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue());
+						List<SysUser> sysUsers = userList.stream().filter(e -> engineeringInterfacePerson.equals(e.getUsername())).collect(Collectors.toList());
+						//验证人员是否存在
+						personnelVerifyTemp(projectLawsInventoryEO, errorMsg, msgList, engineeringInterfacePerson, sysUsers, nameCn, nameEn, ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue());
+//						personnelVerify(projectLawsInventoryEO, errorMsg, msgList, engineeringInterfacePerson, mapPersonList, nameCn, nameEn, ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue());
 					}
 				}
 			}
@@ -6258,6 +6280,51 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 			msgList.add(errorMsg);
 		}
 	}
+	private void personnelVerifyTemp(ProjectLawsInventoryEO projectLawsInventoryEO,
+								 String errorMsg, List<String> msgList,
+								 String regulationOwnerId,
+									 List<SysUser> sysUserList,
+								 String nameCn, String nameEn,
+								 String fieldNumber) {
+		//单选
+		if (regulationOwnerId.contains(",")) {
+			if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+				errorMsg += nameCn + "导入只能填写一个用户名, ";
+			} else {
+				errorMsg += "Only one user name can be entered for" + nameEn + "import, ";
+			}
+			msgList.add(errorMsg);
+		}
+
+		if (ObjectUtils.isNotEmpty(sysUserList)) {
+			if (ProjectRoleEnum.REGULATI_ENGINEER.getValue().equals(fieldNumber)) {
+				projectLawsInventoryEO.setRegulationOwnerId(sysUserList.get(0).getId());
+			} else if (ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(fieldNumber)) {
+				projectLawsInventoryEO.setHomologationEngineerId(sysUserList.get(0).getId());
+			} else if (ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue().equals(fieldNumber)) {
+				projectLawsInventoryEO.setEngineeringInterfacePerson(sysUserList.get(0).getId());
+			} else if (ProjectRoleEnum.DESIGNINITIATOR.getValue().equals(fieldNumber)) {
+				projectLawsInventoryEO.setDesignInitiatorId(sysUserList.get(0).getId());
+			} else if (ProjectRoleEnum.DESIGNDUTY.getValue().equals(fieldNumber)) {
+				projectLawsInventoryEO.setDesignDutyId(sysUserList.get(0).getId());
+			} else if (ProjectRoleEnum.PREHOMOINITIATOR.getValue().equals(fieldNumber)) {
+				projectLawsInventoryEO.setPrehomoInitiatorId(sysUserList.get(0).getId());
+			} else if (ProjectRoleEnum.PREHOMODUTY.getValue().equals(fieldNumber)) {
+				projectLawsInventoryEO.setPrehomoDutyId(sysUserList.get(0).getId());
+			} else if (ProjectRoleEnum.VERIFYINITIATOR.getValue().equals(fieldNumber)) {
+				projectLawsInventoryEO.setVerifyInitiatorId(sysUserList.get(0).getId());
+			} else if (ProjectRoleEnum.VERIFYDUTY.getValue().equals(fieldNumber)) {
+				projectLawsInventoryEO.setVerifyDutyId(sysUserList.get(0).getId());
+			}
+		}else{
+			if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+				errorMsg += nameCn + regulationOwnerId + "不存在， ";
+			} else {
+				errorMsg += nameEn + regulationOwnerId + "absent, ";
+			}
+			msgList.add(errorMsg);
+		}
+	}
 
 	private boolean dateVerify(ProjectLawsInventoryEO projectLawsInventoryEO, String errorMsg,
 							   Date field, List<String> msgList,

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java

@@ -6,6 +6,7 @@ import com.jero.modules.platform.entity.PlatformTaskPlanningEO;
 import com.jero.modules.platform.mapper.PlatformTaskPlanningEOMapper;
 import com.jero.modules.platform.service.IPlatformTaskPlanningEOService;
 import com.jero.modules.project.enums.PlanStatusEnum;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.stereotype.Service;
 
 import java.text.ParseException;
@@ -43,12 +44,18 @@ public class PlatformTaskPlanningEOServiceImpl extends ServiceImpl<PlatformTaskP
 	@Override
     public void addBatch(List<PlatformTaskPlanningEO> platformTaskPlanningEOList) {
 		if(!platformTaskPlanningEOList.isEmpty()){
+			//先删除在新增
+//			LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+			LambdaQueryWrapper<PlatformTaskPlanningEO> wrapper = new LambdaQueryWrapper<>();
+//			wrapper.eq(PlatformTaskPlanningEO::getCreateBy,loginUser.getUsername());
+			wrapper.eq(PlatformTaskPlanningEO::getProjectId,platformTaskPlanningEOList.get(0).getProjectId());
+			this.remove(wrapper);
 			for (PlatformTaskPlanningEO platformTaskPlanningEO : platformTaskPlanningEOList) {
 				Date now = new Date();
 				platformTaskPlanningEO.setCreateTime(now);
 				platformTaskPlanningEO.setUpdateTime(now);
 			}
-			saveOrUpdateBatch(platformTaskPlanningEOList);
+			saveBatch(platformTaskPlanningEOList);
 		}
     }
 
@@ -120,12 +127,14 @@ public class PlatformTaskPlanningEOServiceImpl extends ServiceImpl<PlatformTaskP
 			platformTaskPlanningEO.setName(platformTaskPlanningEO.getNodeName());
 			platformTaskPlanningEO.setTime(platformTaskPlanningEO.getNodeTime());
 			platformTaskPlanningEO.setG(false);
-			if(platformTaskPlanningEO.getNodeTime().after(date)){
+			if(ObjectUtils.isNotEmpty(platformTaskPlanningEO.getNodeTime())){
-				platformTaskPlanningEO.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
+				if(platformTaskPlanningEO.getNodeTime().after(date)){
-			}else if(platformTaskPlanningEO.getNodeTime().before(date)){
+					platformTaskPlanningEO.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
-				platformTaskPlanningEO.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
+				}else if(platformTaskPlanningEO.getNodeTime().before(date)){
-			}else{
+					platformTaskPlanningEO.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
-				platformTaskPlanningEO.setStatus(PlanStatusEnum.ON_GOING.getValue());
+				}else{
+					platformTaskPlanningEO.setStatus(PlanStatusEnum.ON_GOING.getValue());
+				}
 			}
 		}
 		return taskPlanningEOList;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java

@@ -61,6 +61,16 @@ public class ProjectLibraryBaseController extends JeroController<ProjectLibraryB
 		Page pages = projectLibraryBaseService.getPages(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString()), pageList);
 		return Result.OK(params.get("cut").toString(),pages);
 	}
+	@AutoLog(value = "认证清单引用交付物")
+	@ApiOperation(value="认证清单引用交付物", notes="认证清单引用交付物")
+	@PostMapping(value = "/quotePage")
+//	@PostMapping(value = "/page")
+	public Result<?> quotePage(@RequestBody Map<String,Object> params) {
+		params.put("flag","quote");
+		List<ProjectLibraryBase> pageList= projectLibraryBaseService.queryPageList(params);
+		Page pages = projectLibraryBaseService.getPages(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString()), pageList);
+		return Result.OK(params.get("cut").toString(),pages);
+	}
 
 	/**
 	 * 勾选法规清单进行关联平台件

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml

@@ -66,7 +66,11 @@
         <include refid="select_item"/>
 
         <where>
-            plb.platform is null
+        1=1
+            <if test="params.flag != 'quote'">
+                and plb.platform is null
+            </if>
+
             <if test="params.projectName != null and params.projectName != ''">
                 <!--搜索条件:项目名称,包含%,单独搜索-->
                 <choose>
@@ -128,7 +132,13 @@
                 and plb.brand = #{params.brand}
             </if>
         </where>
-        order by plb.sort desc, plb.create_time desc
+        <if test="params.flag = 'quote'">
+            order by plb.platform, plb.sort desc, plb.create_time desc
+        </if>
+        <if test="params.flag != 'quote'">
+            order by plb.sort desc, plb.create_time desc
+        </if>
+
     </select>
     <select id="queryMaimList" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
 

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

@@ -11677,7 +11677,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		return pageList;
 	}
 
-	private void platformDispose(ProjectLawsInventoryEO projectLawsInventoryEO, List<ProjectLawsInventoryEO> result) {
+	public void platformDispose(ProjectLawsInventoryEO projectLawsInventoryEO, List<ProjectLawsInventoryEO> result) {
 		List<String> valueList = FlowStateEnum.getValueInfo();
 		List<LawsInventoryPlatformEO> lawsInventoryPlatformEOList = new ArrayList<>();
 		List<ProjectLawsInventoryEO> projectLawsInventoryEOS = new ArrayList<>();

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

@@ -1084,6 +1084,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	 */
 	@Override
 	public List<ProjectLibraryBase> queryPageList(Map<String,Object> params) {
+		String quote = (String) params.get("quote");
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		Integer isViewer = sysRoleMapper.queryUserRoleByCode(ProjectRoleEnum.VIEWER.getName(), loginUser.getId());
 		Set<String> projectIds = new HashSet<>();
@@ -1148,6 +1149,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 						+ "-" + projectLibraryBase.getYearName()
 						+ "-" + targetMarket
 						+ "-" + projectVersion);
+			}else{
+				projectLibraryBase.setProjectName(projectLibraryBase.getProjectNameId());
 			}
 		}
 
@@ -1449,11 +1452,14 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		String cut = (String) params.get("cut");//
 		String projectLibraryIds = (String) params.get("projectLibraryIds");//法规清单id
 		String platformProjectLibraryIds = (String) params.get("platformProjectLibraryIds");//平台件法规id
-
 		//法规清单数据
 		LambdaQueryWrapper<ProjectLawsInventoryEO> wrapper = new LambdaQueryWrapper<>();
 		wrapper.in(ProjectLawsInventoryEO::getId,Arrays.asList(projectLibraryIds.split(",")));
 		List<ProjectLawsInventoryEO> lawsInventoryEOList = projectLawsInventoryEOService.list(wrapper);
+
+		ProjectLawsInventoryEO projectLawsInventoryEOTemp = new ProjectLawsInventoryEO();
+		projectLawsInventoryEOTemp.setCut(cut);
+		projectLawsInventoryEOService.platformDispose(projectLawsInventoryEOTemp,lawsInventoryEOList);
 		//只有法规的设计符合性确认和验证符合性确认中的流程状态均为清单待发布的时候，才能关联平台件数据
 		lawsInventoryEOList = lawsInventoryEOList.stream()
 				.filter(e->ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue().equals(e.getDesignFlowStatus())
@@ -1484,8 +1490,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 			//serialNumber dutyTerritory
 			String serialNumber = projectLawsInventoryEO.getSerialNumber();
 			String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
-			String subtitle = projectLawsInventoryEO.getSubtitle();
+			String subtitle = StringUtils.isNotEmpty(projectLawsInventoryEO.getSubtitle()) ? projectLawsInventoryEO.getSubtitle() : "";;
-
 			//责任领域
 			List<String> list = new LinkedList<>();
 			if(StringUtils.isNotBlank(dutyTerritory)){

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java

@@ -2,15 +2,21 @@ package com.jero.modules.wkflow.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.vo.Result;
 import com.jero.common.exception.JeroBootException;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
+import com.jero.modules.project.entity.LawsInventoryPlatformEO;
+import com.jero.modules.project.entity.ProjectLawsInventoryEO;
 import com.jero.modules.project.enums.CertificationFlowNodeEnum;
 import com.jero.modules.project.enums.OperatorTypeEnum;
 import com.jero.modules.project.enums.RequestSourceEnum;
 import com.jero.modules.project.enums.ReviewResultEnum;
+import com.jero.modules.project.service.impl.LawsInventoryPlatformEOServiceImpl;
+import com.jero.modules.project.service.impl.ProjectLawsInventoryEOServiceImpl;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.todoCenter.entity.ProcessInfoEO;
@@ -23,18 +29,17 @@ import com.jero.modules.wkflow.enums.FlowTypeEnum;
 import com.jero.modules.wkflow.mapper.ProcessHistoryEOMapper;
 import com.jero.modules.wkflow.service.IProcessHistoryEOService;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
 /**
  * @Description: 流程历史表
  * @Author: jero-boot
@@ -50,6 +55,10 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl<ProcessHistoryEOMap
 	private IProcessInfoEOService processInfoEOService;
 	@Autowired
 	private IOSSFileService ossFileService;
+	@Autowired
+	private LawsInventoryPlatformEOServiceImpl lawsInventoryPlatformEOService;
+	@Autowired
+	private ProjectLawsInventoryEOServiceImpl projectLawsInventoryEOService;
 
 	/**
 	 * 保存
@@ -296,6 +305,22 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl<ProcessHistoryEOMap
 		if (StringUtils.isEmpty(projectLawsInventoryId)) {
 			throw new JeroBootException("法规清单id不能为空！");
 		}
+		//查询是否关联平台件
+		LambdaQueryWrapper<LawsInventoryPlatformEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(LawsInventoryPlatformEO::getLawsInventoryId,projectLawsInventoryId);
+		List<LawsInventoryPlatformEO> platformEOList = lawsInventoryPlatformEOService.list(wrapper);
+
+		//List<String> valueList = FlowStateEnum.getValueInfo();
+		List<ProjectLawsInventoryEO> lawsInventoryEOList = new ArrayList<>();
+		if(ObjectUtils.isNotEmpty(platformEOList)){
+			List<String> lawsInventoryIdList = platformEOList.stream()
+					.map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).distinct().collect(Collectors.toList());
+			lawsInventoryEOList = projectLawsInventoryEOService.listByIds(lawsInventoryIdList);
+			if(ObjectUtils.isNotEmpty(lawsInventoryEOList)){
+				projectLawsInventoryId = lawsInventoryEOList.get(0).getId();
+			}
+		}
+
 		String flowType = (String) params.get("flowType");
 		List<String> flowTypeList = new ArrayList<>();
 		flowTypeList.add(flowType);