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

@@ -32,6 +32,7 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
@@ -162,15 +163,6 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
             throw new LocalBadRequest("车牌号码已存在，请重新输入！");
         }
 
-        // 发动机号 字段的唯一性校验
-        LambdaQueryWrapper<JgVehicleInformation> engineWrapper = new LambdaQueryWrapper<>();
-        engineWrapper.eq(JgVehicleInformation::getEngineNumber, vehicleInfoDto.getEngineNumber());
-        engineWrapper.ne(!ValidationUtil.isEmpty(vehicleInfoDto.getSequenceNbr()), JgVehicleInformation::getSequenceNbr, vehicleInfoDto.getSequenceNbr());
-        Integer enginecount = this.baseMapper.selectCount(engineWrapper);
-        if (enginecount > 0) {
-            throw new LocalBadRequest("发动机号已存在，请重新输入！");
-        }
-
         // 【A109】 车用气瓶登记业务 车架号 校验唯一性
         LambdaQueryWrapper<JgVehicleInformation> informationLambdaQueryWrapper = new LambdaQueryWrapper<>();
         informationLambdaQueryWrapper.eq(JgVehicleInformation::getIdentificationCode, vehicleInfoDto.getIdentificationCode());
@@ -242,7 +234,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         vehicleInformation.setVolume(String.valueOf(equipmentLists.stream()
                 .mapToDouble(x -> Double.parseDouble(String.valueOf(x.get("singleBottleVolume"))))
                 .sum()));
-        vehicleInformation.setFillingMedium(equipmentLists.get(0).get("chargingMedium")+"");
+        vehicleInformation.setFillingMedium(Systemctl.dictionarieClient.value("FILLING_MEDIUM", equipmentLists.get(0)
+                .get("chargingMedium")+"").getResult().getDictDataValue());
 
         boolean hasId = StringUtils.isEmpty(vehicleInfoDto.getSequenceNbr());
         //新增