From b53e337c651b5618691663c5268a33157e089b93 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期四, 17 十月 2024 09:58:20 +0800
Subject: [PATCH] statistic workload change
---
pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/task/WorkloadTask.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/task/WorkloadTask.java b/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/task/WorkloadTask.java
index e39742c..28154a0 100644
--- a/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/task/WorkloadTask.java
+++ b/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/task/WorkloadTask.java
@@ -28,14 +28,15 @@
log.info("鍚姩缁熻浜哄憳宸ヤ綔閲忎换鍔�");
OthStatisticWorkloadMapper workloadMapper = SpringContextUtil.getBean(OthStatisticWorkloadMapper.class);
//鎵惧埌鏈�澶т竴鏉℃棩鏈熻褰�
- Date maxDate = workloadMapper.selectMaxDate();
+ DateTimeFormatter formatter = DateTimeFormatter.ISO_DATE;
+ LocalDate maxLocalDate = LocalDate.parse(workloadMapper.selectMaxDate(), formatter);
//寰�鍚庡惊鐜ぉ鏁版眹鎬� //寰幆缁熻
- LocalDate maxLocalDate = null;
+ /* LocalDate maxLocalDate = null;
if (maxDate == null) {
maxLocalDate = LocalDate.now().minusDays(2);
} else {
maxLocalDate = maxDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
- }
+ }*/
LocalDate today = LocalDate.now();
LocalDate statisticDate = maxLocalDate.plusDays(1);
@@ -44,6 +45,7 @@
daysBetween = 30;
statisticDate = today.minusDays(daysBetween);
}
+
for (int i = 1; i <= daysBetween; i++) {
Date startDt = Date.from(LocalDateTime.of(statisticDate, LocalTime.of(0, 0, 0)).atZone(ZoneId.systemDefault()).toInstant());
Date endDt = Date.from(LocalDateTime.of(statisticDate, LocalTime.of(23, 59, 59)).atZone(ZoneId.systemDefault()).toInstant());
--
Gitblit v1.8.0