气瓶充装介质查询字典名称

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

@@ -426,6 +426,7 @@
             ri."EQU_TYPE" equType,
             ri."EQU_CODE_TYPE" equCodeType,
             ri."WHETHER_VEHICLE_CYLINDER" whetherVehicleCylinder,
+            pv."CHARGING_MEDIUM" chargingMedium,
             (select name from cb_data_dictionary where code = pv."CHARGING_MEDIUM" and type = 'FILLING_MEDIUM') chargingMedium,
             pv."NOMINAL_WORKING_PRESSURE" nominalWorkingPressure,
             pv."SINGLE_BOTTLE_VOLUME" singleBottleVolume,

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

@@ -14,7 +14,6 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.ConstructionEnum;
-import com.yeejoin.amos.boot.module.jg.api.enums.CylinderTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
 import com.yeejoin.amos.boot.module.jg.biz.dao.ESEquipmentCategory;
@@ -24,7 +23,10 @@ import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgRegisterInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.CategoryOtherInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.RegistrationInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.SuperviseInfoMapper;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
@@ -1837,7 +1839,13 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         if ("8300".equals(jsonObject.get("EQU_CATEGORY_CODE"))) {
             return jgUseRegistrationMapper.queryForUnitPipelineEquipmentPage(page, jsonObject);
         } else if ("2300".equals(jsonObject.get("EQU_CATEGORY_CODE"))) {
-            return jgUseRegistrationMapper.queryForUnitVesselEquipmentPage(page, jsonObject);
+            List<DictionarieValueModel> fillingMedium = Systemctl.dictionarieClient.dictValues("FILLING_MEDIUM").getResult();
+            Map<String, Object> fillingMediumMap = fillingMedium.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey,DictionarieValueModel::getDictDataValue));
+            Page<JSONObject> result = jgUseRegistrationMapper.queryForUnitVesselEquipmentPage(page, jsonObject);
+            result.getRecords().forEach(i -> {
+               i.put("chargingMedium", fillingMediumMap.get("chargingMedium"));
+            });
+            return result;
         }
         return page;
     }
@@ -1848,6 +1856,12 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         String useUnitCreditCode = reginParams.getCompany().getCompanyCode();
         jsonObject.put("useUnitCreditCode", useUnitCreditCode);
         Page<JSONObject> page = new Page<>(jsonObject.getLong("number"),jsonObject.getLong("size"));
-        return jgUseRegistrationMapper.queryForEquipUsedByVehiclePage(page, jsonObject);
+        List<DictionarieValueModel> fillingMedium = Systemctl.dictionarieClient.dictValues("FILLING_MEDIUM").getResult();
+        Map<String, Object> fillingMediumMap = fillingMedium.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey,DictionarieValueModel::getDictDataValue));
+        Page<JSONObject> result = jgUseRegistrationMapper.queryForEquipUsedByVehiclePage(page, jsonObject);
+        result.getRecords().forEach(i -> {
+            i.put("chargingMedium", fillingMediumMap.get("chargingMedium"));
+        });
+        return result;
     }
 }
\ No newline at end of file

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

@@ -39,8 +39,8 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.EquCodeTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 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.DictionarieValueModel;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
@@ -1158,7 +1158,13 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 List<String> records = equipmentLists.stream().map(v -> (String) v.get("record")).collect(Collectors.toList());
                 jsonObject.remove("equipmentLists");
                 if (CylinderTypeEnum.CYLINDER.getCode().equals(jsonObject.get("EQU_CATEGORY_CODE"))) {
-                    jsonObject.put("equipmentLists", jgUseRegistrationMapper.queryForUnitVesselEquipment(records));
+                    List<DictionarieValueModel> fillingMedium = Systemctl.dictionarieClient.dictValues("FILLING_MEDIUM").getResult();
+                    Map<String, Object> fillingMediumMap = fillingMedium.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey,DictionarieValueModel::getDictDataValue));
+                    List<Map<String, Object>> result = jgUseRegistrationMapper.queryForUnitVesselEquipment(records);
+                    result.forEach(i -> {
+                        i.put("chargingMedium", fillingMediumMap.get("chargingMedium"));
+                    });
+                    jsonObject.put("equipmentLists", result);
                 } else {
                     jsonObject.put("equipmentLists", jgUseRegistrationMapper.queryForUnitPipelineEquipment(records));
                 }