1.大屏bug修改

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/CylinderFillingRecordStatisticsDto.java

@@ -4,7 +4,7 @@ import lombok.Data;
 
 @Data
 public class CylinderFillingRecordStatisticsDto {
-    private String time;
+    private String fillingTime;
     private String fillingQuantity;
     private String offloadingVolume;
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/CylinderDPStatisticsServiceImpl.java

@@ -445,14 +445,16 @@ public class CylinderDPStatisticsServiceImpl {
            fillingRecord = cylinderInfoMapper.queryFillingRecordByOrgCode(orgCode, LocalDate.now().minusDays(29).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")),null);
            offloading = cylinderInfoMapper.queryoffloadingByOrgCode(orgCode, LocalDate.now().minusDays(29).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")),null);
         }
-        Map<String, String> fillingRecordMap = fillingRecord.stream().collect(Collectors.toMap(CylinderFillingRecordStatisticsDto::getTime, CylinderFillingRecordStatisticsDto::getFillingQuantity));
-        Map<String, String> offloadingMap = offloading.stream().collect(Collectors.toMap(CylinderFillingRecordStatisticsDto::getTime, CylinderFillingRecordStatisticsDto::getOffloadingVolume));
+        Map<String, String> fillingRecordMap = fillingRecord.stream().collect(Collectors.toMap(CylinderFillingRecordStatisticsDto::getFillingTime, CylinderFillingRecordStatisticsDto::getFillingQuantity));
+        Map<String, String> offloadingMap = offloading.stream().collect(Collectors.toMap(CylinderFillingRecordStatisticsDto::getFillingTime, CylinderFillingRecordStatisticsDto::getOffloadingVolume));
         List<CylinderFillingRecordStatisticsDto> data = new ArrayList<>();
         for (String key : times) {
             CylinderFillingRecordStatisticsDto dayData = new CylinderFillingRecordStatisticsDto();
-            dayData.setTime(key);
-            dayData.setFillingQuantity(fillingRecordMap.getOrDefault(key, "0"));
-            dayData.setOffloadingVolume(offloadingMap.getOrDefault(key, "0"));
+            dayData.setFillingTime(key);
+            String filling = fillingRecordMap.getOrDefault(key, "0");
+            dayData.setFillingQuantity(filling.equals("0") ? filling : Double.valueOf(filling).toString());
+            String offloadingRecord = offloadingMap.getOrDefault(key, "0");
+            dayData.setOffloadingVolume(offloadingRecord.equals("0") ? offloadingRecord : Double.valueOf(offloadingRecord).toString());
             data.add(dayData);
         }
         return data;