Commit 7f598d27 authored by 韩桐桐's avatar 韩桐桐

fix(jg):充装介质字典回显

parent fc273ef6
...@@ -1843,7 +1843,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -1843,7 +1843,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
Map<String, Object> fillingMediumMap = fillingMedium.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey,DictionarieValueModel::getDictDataValue)); Map<String, Object> fillingMediumMap = fillingMedium.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey,DictionarieValueModel::getDictDataValue));
Page<JSONObject> result = jgUseRegistrationMapper.queryForUnitVesselEquipmentPage(page, jsonObject); Page<JSONObject> result = jgUseRegistrationMapper.queryForUnitVesselEquipmentPage(page, jsonObject);
result.getRecords().forEach(i -> { result.getRecords().forEach(i -> {
i.put("chargingMedium", fillingMediumMap.get("chargingMedium")); i.put("chargingMedium", fillingMediumMap.get(i.get("chargingMedium")));
}); });
return result; return result;
} }
...@@ -1860,7 +1860,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -1860,7 +1860,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
Map<String, Object> fillingMediumMap = fillingMedium.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey,DictionarieValueModel::getDictDataValue)); Map<String, Object> fillingMediumMap = fillingMedium.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey,DictionarieValueModel::getDictDataValue));
Page<JSONObject> result = jgUseRegistrationMapper.queryForEquipUsedByVehiclePage(page, jsonObject); Page<JSONObject> result = jgUseRegistrationMapper.queryForEquipUsedByVehiclePage(page, jsonObject);
result.getRecords().forEach(i -> { result.getRecords().forEach(i -> {
i.put("chargingMedium", fillingMediumMap.get("chargingMedium")); i.put("chargingMedium", fillingMediumMap.get(i.get("chargingMedium")));
}); });
return result; return result;
} }
......
...@@ -1162,7 +1162,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -1162,7 +1162,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
Map<String, Object> fillingMediumMap = fillingMedium.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey,DictionarieValueModel::getDictDataValue)); Map<String, Object> fillingMediumMap = fillingMedium.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey,DictionarieValueModel::getDictDataValue));
List<Map<String, Object>> result = jgUseRegistrationMapper.queryForUnitVesselEquipment(records); List<Map<String, Object>> result = jgUseRegistrationMapper.queryForUnitVesselEquipment(records);
result.forEach(i -> { result.forEach(i -> {
i.put("chargingMedium", fillingMediumMap.get("chargingMedium")); i.put("chargingMedium", fillingMediumMap.get(i.get("chargingMedium")));
}); });
jsonObject.put("equipmentLists", result); jsonObject.put("equipmentLists", result);
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment