fix(决算): 退役、报废、销毁 查询的结束时间修改为23.59.59

dev-finalcheck/src/main/java/com/tykj/dev/device/finalcheck/service/impl/FinalCheckServiceImpl.java

@@ -35,6 +35,7 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static com.tykj.dev.misc.utils.TimestampUtil.localDateToDate;
+import static com.tykj.dev.misc.utils.TimestampUtil.localDateToDateEnd;
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.toMap;
 
@@ -136,20 +137,20 @@ public class FinalCheckServiceImpl implements FinalCheckService {
                 .stream()
                 .collect(toMap(deviceStatistics -> deviceStatistics.getModel()+"Ǵ"+deviceStatistics.getName(), Function.identity()));
         //销毁
-        Map<String, DeviceStatistics> destroyMap = dataService.getDestroyStatistics(localDateToDate(startTime), localDateToDate(endTime))
+        Map<String, DeviceStatistics> destroyMap = dataService.getDestroyStatistics(localDateToDate(startTime), localDateToDateEnd(endTime))
                 .stream()
                 .collect(toMap(deviceStatistics -> deviceStatistics.getModel()+"Ǵ"+deviceStatistics.getName(), Function.identity()));
         //报废
-        Map<String, DeviceStatistics> scrapMap = dataService.getScrapStatistics(localDateToDate(startTime), localDateToDate(endTime))
+        Map<String, DeviceStatistics> scrapMap = dataService.getScrapStatistics(localDateToDate(startTime), localDateToDateEnd(endTime))
                 .stream()
                 .collect(toMap(deviceStatistics -> deviceStatistics.getModel()+"Ǵ"+deviceStatistics.getName(), Function.identity()));
 
         //退役
-        Map<String, DeviceStatistics> retireMap = dataService.getDecommissioningStatistics(localDateToDate(startTime), localDateToDate(endTime))
+        Map<String, DeviceStatistics> retireMap = dataService.getDecommissioningStatistics(localDateToDate(startTime), localDateToDateEnd(endTime))
                 .stream()
                 .collect(toMap(deviceStatistics -> deviceStatistics.getModel()+"Ǵ"+deviceStatistics.getName(), Function.identity()));
         //丢失
-        Map<String, DeviceStatistics> lossMap = dataService.getLossStatistics(localDateToDate(startTime), localDateToDate(endTime))
+        Map<String, DeviceStatistics> lossMap = dataService.getLossStatistics(localDateToDate(startTime), localDateToDateEnd(endTime))
                 .stream()
                 .collect(toMap(deviceStatistics -> deviceStatistics.getModel() + "G" + deviceStatistics.getName(), Function.identity()));
         for (Map.Entry<String, List<DeviceLibrary>> entry : map.entrySet()) {

dev-misc/src/main/java/com/tykj/dev/misc/utils/TimestampUtil.java

@@ -130,6 +130,14 @@ public class TimestampUtil {
         return Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
     }
 
+
+    /**
+     * 默认将时分秒设置为23.59.59
+     */
+    public static Date localDateToDateEnd(LocalDate localDate) {
+        return Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).plusDays(1).minusSeconds(1).toInstant());
+    }
+
     public static LocalDate dateToLocalDate(Date date) {
         return date.toInstant()
                 .atZone(ZoneId.systemDefault())