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/JgVehicleInformationServiceImpl.java

@@ -233,34 +233,35 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                 vehicleInfoDto.setUseRegistrationFormUrl(String.valueOf(vehicle.get("useRegistrationFormUrl")));
             }
             List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) map.get("equipmentLists");
-            if (CollectionUtils.isEmpty(equipmentLists) ||
-                    equipmentLists.stream().map(v -> (String) v.get("chargingMedium")).distinct().count() != 1) {
-                throw new BadRequest(CollectionUtils.isEmpty(equipmentLists) ? "请选择设备信息!" : "请选择相同充装介质设备！");
-            }
+
             if (SUBMIT_TYPE_FLOW.equals(submit)) {
+                if (CollectionUtils.isEmpty(equipmentLists) ||
+                        equipmentLists.stream().map(v -> (String) v.get("chargingMedium")).distinct().count() != 1) {
+                    throw new BadRequest(CollectionUtils.isEmpty(equipmentLists) ? "请选择设备信息!" : "请选择相同充装介质设备！");
+                }
                 // 检查设备是否已经在使用
                 // 个人主体的身份证（6600_620422199903010258） 特殊处理 只取_后的身份证号码
                 this.repeatUsedEquipCheck(equipmentLists,
                         CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ? company.getCompanyCode().split("_")[1] : company.getCompanyCode());
-            }
-            List<IdxBizJgInspectionDetectionInfo> inspectionDetectionInfoList = idxBizJgInspectionDetectionInfoService.checkInspectionInfo(
-                    equipmentLists.stream()
-                            .map(v -> (String) v.get("record"))
-                            .collect(Collectors.toList())
-            );
+                List<IdxBizJgInspectionDetectionInfo> inspectionDetectionInfoList = idxBizJgInspectionDetectionInfoService.checkInspectionInfo(
+                        equipmentLists.stream()
+                                .map(v -> (String) v.get("record"))
+                                .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)
+                        .min(Date::compareTo)
+                        .orElse(null));
             }
 
-            vehicleInfoDto.setNextInspectionDate(inspectionDetectionInfoList.stream()
-                    .map(IdxBizJgInspectionDetectionInfo::getNextInspectDate)
-                    .filter(Objects::nonNull)
-                    .min(Date::compareTo)
-                    .orElse(null));
-
             vehicleInfoDto.setCreateDate(new Date());
             vehicleInfoDto.setPromoter(reginParams.getUserModel().getUserId());
 
@@ -351,12 +352,19 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
             vehicleInformation.setRegDate(new Date());
             vehicleInformation.setUseDate(Optional.ofNullable(String.valueOf(map.get("useDate"))).orElse(""));
             vehicleInformation.setCreateUserName(reginParams.getUserModel().getRealName());
-            vehicleInformation.setGasNum(equipmentLists.size());
-            BigDecimal totalVolume = equipmentLists.stream()
+            vehicleInformation.setGasNum(Optional.ofNullable(equipmentLists).map(List::size).orElse(0));
+            BigDecimal totalVolume = Optional.ofNullable(equipmentLists)
+                    .orElse(Collections.emptyList())
+                    .stream()
                     .map(x -> new BigDecimal(String.valueOf(x.get("singleBottleVolume"))))
                     .reduce(BigDecimal.ZERO, BigDecimal::add);
             vehicleInformation.setVolume(totalVolume.toPlainString());
-            vehicleInformation.setFillingMedium(equipmentLists.get(0).get("chargingMedium") + "");
+
+            String fillingMedium = Optional.ofNullable(equipmentLists)
+                    .filter(list -> !list.isEmpty())
+                    .map(list -> String.valueOf(list.get(0).get("chargingMedium")))
+                    .orElse("");
+            vehicleInformation.setFillingMedium(fillingMedium);
 
             boolean hasId = StringUtils.isEmpty(vehicleInfoDto.getSequenceNbr());
             //新增