Преглед на файлове

Merge branch 'master' into test

李进 преди 1 година
родител
ревизия
0c8eec2ea3
променени са 1 файла, в които са добавени 1 реда и са изтрити 1 реда
  1. 1 1
      device-api-service/src/main/java/com/xy/service/DeviceAlgorithmChargingServiceImpl.java

+ 1 - 1
device-api-service/src/main/java/com/xy/service/DeviceAlgorithmChargingServiceImpl.java

@@ -375,7 +375,7 @@ public class DeviceAlgorithmChargingServiceImpl extends ServiceImpl<DeviceAlgori
     public R<Map<Long, Integer>> charging(List<DeviceAlgorithmChargingDto.Charging> chargings) {
         //封装默认返回值
         Map<Long, Integer> map = new JHashMap<>(chargings.size());
-        chargings.forEach(charging -> map.put(charging.getMercDeviceAlgorithmChargingId(), 0));
+        chargings.forEach(charging -> map.put(charging.getMercDeviceAlgorithmChargingId(), charging.getSize()));
         //查询数据
         List<DeviceAlgorithmCharging> queryList = new ArrayList<>(chargings.size());
         for (DeviceAlgorithmChargingDto.Charging charging : chargings) {