From 31304b4630273269a4a7348433eec40be897d679 Mon Sep 17 00:00:00 2001 From: sunyugang Date: Tue, 23 Sep 2025 10:11:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=90=8D=E7=A7=B0=E6=94=B9?= =?UTF-8?q?=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/dw/controller/XyCheckController.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/XyCheckController.java b/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/XyCheckController.java index 512db6d..9900663 100644 --- a/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/XyCheckController.java +++ b/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/XyCheckController.java @@ -59,7 +59,7 @@ public class XyCheckController extends BaseController { * 修改考核状态 * @return */ - @PutMapping("/status") + @PutMapping("/dwStatus") public AjaxResult updateStatus(@RequestBody DataCheckStatus checkStatus) { Calendar startTime = Calendar.getInstance(); startTime.setTime(checkStatus.getBeginDate()); @@ -85,7 +85,7 @@ public class XyCheckController extends BaseController { * 修改考核状态 * @return */ - @PutMapping("/dwStatus") + @PutMapping("/cjStatus") public AjaxResult updateDwStatus(@RequestBody DataCheckStatus checkStatus) { Calendar startTime = Calendar.getInstance(); startTime.setTime(checkStatus.getBeginDate()); @@ -193,24 +193,18 @@ public class XyCheckController extends BaseController { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); // 把周几转成 Java 的 DayOfWeek DayOfWeek targetDay = DayOfWeek.of(weekDay); - LocalTime targetTime = LocalTime.parse(timeStr); LocalDateTime now = LocalDateTime.now(); - // 找到最近一次目标星期+时间（可能是本周，也可能是上周） LocalDate targetDate = now.toLocalDate() .with(TemporalAdjusters.previousOrSame(targetDay)); - LocalDateTime startDateTime = LocalDateTime.of(targetDate, targetTime); - // 如果今天就是目标日但时间还没到，就回退一周 if (now.isBefore(startDateTime)) { startDateTime = startDateTime.minusWeeks(1); } - // 结束时间是起始时间 + 1 周 LocalDateTime endDateTime = startDateTime.plusWeeks(1); - return new String[]{formatter.format(startDateTime.minusWeeks(1)), formatter.format(endDateTime.minusWeeks(1))}; }