From 453e3471e94b91169beec1e258a06a132d927011 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 02 十二月 2024 15:01:50 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/service/WarningAnalyseService.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/yssh/service/WarningAnalyseService.java b/src/main/java/com/yssh/service/WarningAnalyseService.java
index ddc29a7..06cb8f6 100644
--- a/src/main/java/com/yssh/service/WarningAnalyseService.java
+++ b/src/main/java/com/yssh/service/WarningAnalyseService.java
@@ -205,11 +205,23 @@
*/
public List<Qxsh> selectWeekTop10() {
Date now = InitConfig.getDate();
- int weekOfYear = DateUtils.getWeekOfYear(now);
- int year = Integer.parseInt(DateUtils.parseDateToStr(DateUtils.YYYY, now));
- Date lastSun = DateUtils.getWeekOfYearForSun(year, weekOfYear);
- Date mon = DateUtils.getAPeriodOfTime(lastSun, 1, Calendar.DATE);
- Date sun = DateUtils.getAPeriodOfTime(lastSun, 7, Calendar.DATE);
+ //int weekOfYear = DateUtils.getWeekOfYear(now);
+ //int year = Integer.parseInt(DateUtils.parseDateToStr(DateUtils.YYYY, now));
+ //Date lastSun = DateUtils.getWeekOfYearForSun(year, weekOfYear);
+ //Date mon = DateUtils.getAPeriodOfTime(lastSun, 1, Calendar.DATE);
+ //Date sun = DateUtils.getAPeriodOfTime(lastSun, 7, Calendar.DATE);
+
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(now);
+ int dayOfWeek = cal.get(Calendar.DAY_OF_WEEK);
+ int diff = Calendar.MONDAY - dayOfWeek;
+ if (diff > 0) diff -= 7;
+
+ cal.add(Calendar.DAY_OF_MONTH, diff);
+ Date mon = cal.getTime();
+ cal.add(Calendar.DAY_OF_MONTH, 6);
+ Date sun = cal.getTime();
+
Integer intMon = Integer.parseInt(DateUtils.parseDateToStr(DateUtils.YYYYMMDD, mon) + "00"); // 2023080700
Integer intSun = Integer.parseInt(DateUtils.parseDateToStr(DateUtils.YYYYMMDD, sun) + "23"); // 2023081323
--
Gitblit v1.9.3