Skip to content

A
amos-boot-biz
Commit 6e47ab49 authored by 韩桐桐's avatar 韩桐桐
Browse files
Options

fix(jg):气瓶和车用气瓶使用登记时不再检验检测

parent 47e1e975
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 12 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
View file @ 6e47ab49
...@@ -687,13 +687,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -687,13 +687,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
.map(v -> (String) v.get("record")) .map(v -> (String) v.get("record"))
.collect(Collectors.toList()) .collect(Collectors.toList())
); );
if (!CylinderTypeEnum.CYLINDER.getCode().equals(map.get("EQU_CATEGORY_CODE")) &&
(inspectionDetectionInfoList.isEmpty() || inspectionDetectionInfoList.stream().anyMatch(info -> // if (!CylinderTypeEnum.CYLINDER.getCode().equals(map.get("EQU_CATEGORY_CODE")) &&
ObjectUtils.isEmpty(info) || ObjectUtils.isEmpty(info.getInspectType()) || // (inspectionDetectionInfoList.isEmpty() || inspectionDetectionInfoList.stream().anyMatch(info ->
ObjectUtils.isEmpty(info.getInspectConclusion()) || ObjectUtils.isEmpty(info.getInspectOrgCode()) || // ObjectUtils.isEmpty(info) || ObjectUtils.isEmpty(info.getInspectType()) ||
ObjectUtils.isEmpty(info.getInspectOrgName())))) { // ObjectUtils.isEmpty(info.getInspectConclusion()) || ObjectUtils.isEmpty(info.getInspectOrgCode()) ||
throw new BadRequest("请补充设备检验检测信息后提交！"); // ObjectUtils.isEmpty(info.getInspectOrgName())))) {
} // throw new BadRequest("请补充设备检验检测信息后提交！");
// }
JgUseRegistration useRegistration = JSON.parseObject(JSON.toJSONString(map), JgUseRegistration.class); JgUseRegistration useRegistration = JSON.parseObject(JSON.toJSONString(map), JgUseRegistration.class);
useRegistration.setRegDate(new Date()); useRegistration.setRegDate(new Date());
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgVehicleInformationServiceImpl.java
View file @ 6e47ab49
...@@ -201,11 +201,12 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform ...@@ -201,11 +201,12 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
.collect(Collectors.toList()) .collect(Collectors.toList())
); );
if (inspectionDetectionInfoList.stream().anyMatch(info -> // if (inspectionDetectionInfoList.stream().anyMatch(info ->
ObjectUtils.isEmpty(info) || ObjectUtils.isEmpty(info.getInspectType()) || // ObjectUtils.isEmpty(info) || ObjectUtils.isEmpty(info.getInspectType()) ||
ObjectUtils.isEmpty(info.getInspectConclusion()) || ObjectUtils.isEmpty(info.getInspectOrgCode()))) { // ObjectUtils.isEmpty(info.getInspectConclusion()) || ObjectUtils.isEmpty(info.getInspectOrgCode()))) {
throw new BadRequest("请补充设备检验检测信息后提交！"); // throw new BadRequest("请补充设备检验检测信息后提交！");
} // }
vehicleInfoDto.setNextInspectionDate(inspectionDetectionInfoList.stream() vehicleInfoDto.setNextInspectionDate(inspectionDetectionInfoList.stream()
.map(IdxBizJgInspectionDetectionInfo::getNextInspectDate) .map(IdxBizJgInspectionDetectionInfo::getNextInspectDate)
.filter(Objects::nonNull) .filter(Objects::nonNull)
......
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