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

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

@@ -687,13 +687,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                             .map(v -> (String) v.get("record"))
                             .collect(Collectors.toList())
             );
-            if (!CylinderTypeEnum.CYLINDER.getCode().equals(map.get("EQU_CATEGORY_CODE")) &&
-                    (inspectionDetectionInfoList.isEmpty() || inspectionDetectionInfoList.stream().anyMatch(info ->
-                            ObjectUtils.isEmpty(info) || ObjectUtils.isEmpty(info.getInspectType()) ||
-                                    ObjectUtils.isEmpty(info.getInspectConclusion()) || ObjectUtils.isEmpty(info.getInspectOrgCode()) ||
-                                    ObjectUtils.isEmpty(info.getInspectOrgName())))) {
-                throw new BadRequest("请补充设备检验检测信息后提交！");
-            }
+
+            // if (!CylinderTypeEnum.CYLINDER.getCode().equals(map.get("EQU_CATEGORY_CODE")) &&
+            //         (inspectionDetectionInfoList.isEmpty() || inspectionDetectionInfoList.stream().anyMatch(info ->
+            //                 ObjectUtils.isEmpty(info) || ObjectUtils.isEmpty(info.getInspectType()) ||
+            //                         ObjectUtils.isEmpty(info.getInspectConclusion()) || ObjectUtils.isEmpty(info.getInspectOrgCode()) ||
+            //                         ObjectUtils.isEmpty(info.getInspectOrgName())))) {
+            //     throw new BadRequest("请补充设备检验检测信息后提交！");
+            // }
 
             JgUseRegistration useRegistration = JSON.parseObject(JSON.toJSONString(map), JgUseRegistration.class);
             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

@@ -201,11 +201,12 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                             .collect(Collectors.toList())
             );
 
-            if (inspectionDetectionInfoList.stream().anyMatch(info ->
-                    ObjectUtils.isEmpty(info) || ObjectUtils.isEmpty(info.getInspectType()) ||
-                            ObjectUtils.isEmpty(info.getInspectConclusion()) || ObjectUtils.isEmpty(info.getInspectOrgCode()))) {
-                throw new BadRequest("请补充设备检验检测信息后提交！");
-            }
+            // if (inspectionDetectionInfoList.stream().anyMatch(info ->
+            //         ObjectUtils.isEmpty(info) || ObjectUtils.isEmpty(info.getInspectType()) ||
+            //                 ObjectUtils.isEmpty(info.getInspectConclusion()) || ObjectUtils.isEmpty(info.getInspectOrgCode()))) {
+            //     throw new BadRequest("请补充设备检验检测信息后提交！");
+            // }
+
             vehicleInfoDto.setNextInspectionDate(inspectionDetectionInfoList.stream()
                     .map(IdxBizJgInspectionDetectionInfo::getNextInspectDate)
                     .filter(Objects::nonNull)