Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgVehicleInformationMapper.java

@@ -27,7 +27,7 @@ public interface JgVehicleInformationMapper extends BaseMapper<JgVehicleInformat
     List<Map<String, Object>> selectEquipList(@Param("id")Long id);
 
     @MapKey("records")
-    List<Map<String, Object>> queryForUnitVesselEquipment(@Param("records")List<String> records);
+    List<Map<String, Object>> queryForUnitVesselEquipment(@Param("sequenceNbr") Long sequenceNbr, @Param("records")List<String> records);
 
     Long countVesselCylinderIsUsedNumber(@Param("vehicleId") Long vehicleId, @Param("records") List<String> records);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgVehicleInformationMapper.xml

@@ -239,6 +239,7 @@
     <select id="queryForUnitVesselEquipment" resultType="java.util.Map">
         <include refid="page-list-vessel"/>
         WHERE ri."EQU_CATEGORY" = '2300' and jui."DATA_SOURCE" = 'jg' and ri.whether_vehicle_cylinder = 1
+        and ui.sequence_nbr = #{sequenceNbr}
         and jui.record in
         <foreach collection="records" item="record" open="(" close=")" separator=",">
             #{record}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgVehicleInformationController.java

@@ -126,8 +126,13 @@ public class JgVehicleInformationController extends BaseController {
                                                                 @RequestParam(value = "size") int size) {
         Page<Map<String, Object>> page = new Page<>(current, size);
         ReginParams info = getSelectedOrgInfo();
+        String companyCode = info.getCompany().getCompanyCode();
+        // 使用单位为个人时候 特殊处理
+        if (companyCode.split("_").length > 1) {
+            companyCode = companyCode.split("_")[1];
+        }
         dto.setCurrentUserId(info.getUserModel().getUserId());
-        dto.setUseUnitCreditCode(info.getCompany().getCompanyCode());
+        dto.setUseUnitCreditCode(companyCode);
         if (info.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {
             dto.setDataType(BaseController.COMPANY_TYPE_COMPANY);
         } else {

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

@@ -176,8 +176,14 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         }
 
         // 使用单位信息
-        vehicleInfoDto.setUseUnitName(company.getCompanyName());
-        vehicleInfoDto.setUseUnitCreditCode(company.getCompanyCode());
+        if("个人主体".equals(company.getCompanyType())){
+            vehicleInfoDto.setUseUnitName(company.getCompanyName().split("_")[1]);
+            vehicleInfoDto.setUseUnitCreditCode(company.getCompanyCode().split("_")[1]);
+        }else {
+            vehicleInfoDto.setUseUnitName(company.getCompanyName());
+            vehicleInfoDto.setUseUnitCreditCode(company.getCompanyCode());
+        }
+
 
         // 接收单位信息
         if (!StringUtils.isEmpty(vehicleInfoDto.getReceiveOrgCode())) {
@@ -236,8 +242,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         vehicleInformation.setVolume(String.valueOf(equipmentLists.stream()
                 .mapToDouble(x -> Double.parseDouble(String.valueOf(x.get("singleBottleVolume"))))
                 .sum()));
-        vehicleInformation.setFillingMedium(Systemctl.dictionarieClient.value("FILLING_MEDIUM", equipmentLists.get(0)
-                .get("chargingMedium") + "").getResult().getDictDataValue());
+        vehicleInformation.setFillingMedium(equipmentLists.get(0).get("chargingMedium") + "");
 
         boolean hasId = StringUtils.isEmpty(vehicleInfoDto.getSequenceNbr());
         //新增
@@ -460,7 +465,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         List<JgVehicleInformationEq> vehicleInformationEqList = jgVehicleInformationEqService.getBaseMapper().selectList(vehicleInfoEqWrapper);
 
         vo.setEquipmentLists(
-                this.baseMapper.queryForUnitVesselEquipment(
+                this.baseMapper.queryForUnitVesselEquipment(sequenceNbr,
                                 vehicleInformationEqList.stream()
                                         .map(JgVehicleInformationEq::getEquId)
                                         .collect(Collectors.toList())