From bc3313efa51f00e128b6d9483becfd71df4e659d Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期五, 09 八月 2024 18:14:51 +0800 Subject: [PATCH] 检验单审核添加对应试验室bug解决 --- system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java | 32 ++++++++++---------------------- 1 files changed, 10 insertions(+), 22 deletions(-) diff --git a/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java b/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java index 4e345ea..9784910 100644 --- a/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java +++ b/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java @@ -6,6 +6,7 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; +import java.time.format.DateTimeFormatter; import java.time.temporal.TemporalAdjusters; import java.time.temporal.WeekFields; import java.util.Locale; @@ -16,29 +17,16 @@ @Test void contextLoads() { - // 鑾峰彇褰撳墠鏃ユ湡 - LocalDate today = LocalDate.now(); - // 鑾峰彇鏈湀鐨勭涓�澶╁拰鏈�鍚庝竴澶� - LocalDate firstDayOfMonth = today.with(TemporalAdjusters.firstDayOfMonth()); - LocalDate lastDayOfMonth = today.with(TemporalAdjusters.lastDayOfMonth()); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm:ss"); + String a = "09:00:00"; + String b = "17:00:00"; + LocalTime now = LocalTime.now(); + LocalTime startTime = LocalTime.parse(a, formatter); + LocalTime endTime = LocalTime.parse(b, formatter); - // 鑾峰彇鍛ㄥ瓧娈典俊鎭紙鏍规嵁鍖哄煙璁剧疆锛� - WeekFields weekFields = WeekFields.of(Locale.getDefault()); - - // 鑾峰彇鏈湀绗竴澶╃殑鍛ㄤ竴 - LocalDate startOfWeek = firstDayOfMonth.with(TemporalAdjusters.previousOrSame(weekFields.getFirstDayOfWeek())); - - // 閬嶅巻鏈湀鎵�鏈夊ぉ鏁帮紝鎵惧嚭姣忓懆鐨勭涓�澶╁拰鏈�鍚庝竴澶� - LocalDate endOfWeek; - while (startOfWeek.isBefore(firstDayOfMonth.plusMonths(1))) { - endOfWeek = startOfWeek.plusDays(6); - LocalDateTime startDateTime = LocalDateTime.of(startOfWeek, LocalTime.MIDNIGHT); - LocalDateTime endDateTime = LocalDateTime.of(endOfWeek, LocalTime.MIDNIGHT); - - System.out.println("Week starts on " + startDateTime + " and ends on " + endDateTime); - - startOfWeek = startOfWeek.plusWeeks(1); - } + // 妫�鏌ュ綋鍓嶆椂闂存槸鍚﹀湪鑼冨洿鍐咃紙鍖呮嫭杈圭晫锛� + boolean isWithinRange = !now.isBefore(startTime) && !now.isAfter(endTime); + System.out.println(isWithinRange); } } -- Gitblit v1.9.3