Commit 86c00449 authored by 韩桐桐's avatar 韩桐桐

fix(jg):BUG:29189

parent 287ec522
...@@ -61,10 +61,12 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil; ...@@ -61,10 +61,12 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest; import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.yeejoin.amos.boot.module.jg.api.enums.VehicleApanageEnum.XIAN_YANG; import static com.yeejoin.amos.boot.module.jg.api.enums.VehicleApanageEnum.XIAN_YANG;
import static com.yeejoin.amos.boot.module.jg.api.enums.VehicleApanageEnum.XI_XIAN; import static com.yeejoin.amos.boot.module.jg.api.enums.VehicleApanageEnum.XI_XIAN;
...@@ -801,7 +803,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh ...@@ -801,7 +803,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
return map; return map;
} }
private Map<String, Object> getFillingMediumMap() { public Map<String, Object> getFillingMediumMap() {
if (fillingMediumMap == null) { if (fillingMediumMap == null) {
synchronized (this) { synchronized (this) {
if (fillingMediumMap == null) { if (fillingMediumMap == null) {
......
...@@ -228,6 +228,7 @@ public class ShCarServiceImpl extends BaseService<ShCar, ShCar, ShCarMapper> imp ...@@ -228,6 +228,7 @@ public class ShCarServiceImpl extends BaseService<ShCar, ShCar, ShCarMapper> imp
List<Map<String, Object>> equList = changeVehicleRegistrationUnitService.getBaseMapper().getEquList(records) List<Map<String, Object>> equList = changeVehicleRegistrationUnitService.getBaseMapper().getEquList(records)
.stream() .stream()
.peek(x -> x.put("carNumber", completeDataSanHuanMap.get("carNumber"))) .peek(x -> x.put("carNumber", completeDataSanHuanMap.get("carNumber")))
.peek(x -> x.put("chargingMedium", changeVehicleRegistrationUnitService.getFillingMediumMap().get(x.get("chargingMedium"))))
.collect(Collectors.toList()); .collect(Collectors.toList());
gasCylinderChangeMap.put("useUnitCreditCode", String.format("%s_%s", completeDataSanHuanMap.get("useUnitName"), completeDataSanHuanMap.get("useUnitCreditCode"))); gasCylinderChangeMap.put("useUnitCreditCode", String.format("%s_%s", completeDataSanHuanMap.get("useUnitName"), completeDataSanHuanMap.get("useUnitCreditCode")));
gasCylinderChangeMap.put("dataList", equList); gasCylinderChangeMap.put("dataList", equList);
......
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