Commit f42afe00 authored by 刘林's avatar 刘林

fix(jg):超设计使用年限bug修改

parent 0032511b
...@@ -158,18 +158,18 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign ...@@ -158,18 +158,18 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
this.repeatUsedEquipCheck(equipmentLists, this.repeatUsedEquipCheck(equipmentLists,
CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ? company.getCompanyCode().split("_")[1] : company.getCompanyCode()); CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ? company.getCompanyCode().split("_")[1] : company.getCompanyCode());
} }
List<IdxBizJgInspectionDetectionInfo> inspectionDetectionInfoList = idxBizJgInspectionDetectionInfoService.checkInspectionInfo( // List<IdxBizJgInspectionDetectionInfo> inspectionDetectionInfoList = idxBizJgInspectionDetectionInfoService.checkInspectionInfo(
equipmentLists.stream() // equipmentLists.stream()
.map(v -> (String) v.get("record")) // .map(v -> (String) v.get("record"))
.collect(Collectors.toList()) // .collect(Collectors.toList())
); // );
if (equipmentLists.stream().anyMatch(info -> info.get("safetyAssessmentReport") == null || "".equals(info.get("safetyAssessmentReport")))) { if (equipmentLists.stream().anyMatch(info -> info.get("safetyAssessmentReport") == null || "".equals(info.get("safetyAssessmentReport")))) {
throw new BadRequest("请补充设备安全评估报告信息后提交!"); throw new BadRequest("请补充设备安全评估报告信息后提交!");
} }
if (inspectionDetectionInfoList.stream().anyMatch(info -> if (equipmentLists.stream().anyMatch(info ->
ObjectUtils.isEmpty(info) || ObjectUtils.isEmpty(info.getInspectType()) || ObjectUtils.isEmpty(info) || ObjectUtils.isEmpty(info.get("inspectType")) ||
ObjectUtils.isEmpty(info.getInspectConclusion()) || ObjectUtils.isEmpty(info.getInspectOrgCode()))) { ObjectUtils.isEmpty(info.get("inspectConclusion")) || ObjectUtils.isEmpty(info.get("inspectOrgCode")))) {
throw new BadRequest("请补充设备检验检测信息后提交!"); throw new BadRequest("请补充设备检验检测信息后提交!");
} }
if ("2000".equals(Objects.toString(map.get("equListCode"))) && equipmentLists.stream().anyMatch(info -> !"WTJY".equals(info.get("inspectType")))) { if ("2000".equals(Objects.toString(map.get("equListCode"))) && equipmentLists.stream().anyMatch(info -> !"WTJY".equals(info.get("inspectType")))) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment