From 5f84045628543841472685fc92c04324c696a634 Mon Sep 17 00:00:00 2001
From: yangbin <yangbin@qq.com>
Date: 星期三, 19 二月 2025 13:33:16 +0800
Subject: [PATCH] 大屏看板1

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/subcontrol/service/impl/MdcBigScreenServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/subcontrol/service/impl/MdcBigScreenServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/subcontrol/service/impl/MdcBigScreenServiceImpl.java
index 376bd55..5f94fd4 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/subcontrol/service/impl/MdcBigScreenServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/subcontrol/service/impl/MdcBigScreenServiceImpl.java
@@ -50,9 +50,9 @@
         List<BigDecimal> processingRateList = new ArrayList<>();
         List<BigDecimal> shiftRateList = new ArrayList<>();
         //鑾峰彇涓婂懆鍛ㄤ竴鏃ユ湡鍜屽懆鍏棩鏈�
-        LocalDate today = LocalDate.now();
-        LocalDate monday = today.minusDays(7);
-        LocalDate saturday = today.minusDays(1);
+        LocalDate today = LocalDate.now().minusDays(7L);
+        LocalDate monday = today.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY));
+        LocalDate saturday = today.with(TemporalAdjusters.nextOrSame(DayOfWeek.SATURDAY));
         List<String> dates = getMiddleDate(monday, saturday);
         List<String> equipmentIdList = new ArrayList<>();
         //鏍规嵁鍘傚尯id鑾峰彇鍘傚尯璁惧淇℃伅

--
Gitblit v1.9.3