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

@@ -54,11 +54,13 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
 import static com.yeejoin.amos.boot.module.jg.api.enums.VehicleApanageEnum.*;
 import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl.getAuditPassedDate;
 
@@ -235,7 +237,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                 .mapToDouble(x -> Double.parseDouble(String.valueOf(x.get("singleBottleVolume"))))
                 .sum()));
         vehicleInformation.setFillingMedium(Systemctl.dictionarieClient.value("FILLING_MEDIUM", equipmentLists.get(0)
-                .get("chargingMedium")+"").getResult().getDictDataValue());
+                .get("chargingMedium") + "").getResult().getDictDataValue());
 
         boolean hasId = StringUtils.isEmpty(vehicleInfoDto.getSequenceNbr());
         //新增
@@ -456,12 +458,22 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         LambdaQueryWrapper<JgVehicleInformationEq> vehicleInfoEqWrapper = new QueryWrapper<JgVehicleInformationEq>().lambda();
         vehicleInfoEqWrapper.eq(JgVehicleInformationEq::getVehicleId, sequenceNbr);
         List<JgVehicleInformationEq> vehicleInformationEqList = jgVehicleInformationEqService.getBaseMapper().selectList(vehicleInfoEqWrapper);
-        List<Map<String, Object>>  equipmentLists= this.baseMapper.queryForUnitVesselEquipment(vehicleInformationEqList.stream().map(JgVehicleInformationEq::getEquId).collect(Collectors.toList()));
-        vo.setEquipmentLists(equipmentLists);
-        vo.setEquDefineCode(equipmentLists.stream()
-                .findFirst()
-                .map(map -> (String) map.get("equDefine"))
-                .orElse(null));
+
+        vo.setEquipmentLists(
+                this.baseMapper.queryForUnitVesselEquipment(
+                                vehicleInformationEqList.stream()
+                                        .map(JgVehicleInformationEq::getEquId)
+                                        .collect(Collectors.toList())
+                        ).stream()
+                        .peek(v -> v.put("chargingMedium", Systemctl.dictionarieClient.value("FILLING_MEDIUM", v.get("chargingMedium") + "").getResult().getDictDataValue()))
+                        .collect(Collectors.toList())
+        );
+        vo.setEquDefineCode(
+                vo.getEquipmentLists().stream()
+                        .findFirst()
+                        .map(map -> (String) map.get("equDefine"))
+                        .orElse(null)
+        );
         return vo;
     }
 
@@ -995,9 +1007,9 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         return useFlagParamDto;
     }
 
-    private void checkVesselCylinderIsUsed(Long currentVehicleId, List<String> records){
+    private void checkVesselCylinderIsUsed(Long currentVehicleId, List<String> records) {
         Long usedNumber = this.getBaseMapper().countVesselCylinderIsUsedNumber(currentVehicleId, records);
-        if(usedNumber > 0){
+        if (usedNumber > 0) {
             throw new BadRequest("存在已经登记过的气瓶！");
         }
     }