From 65c5d33a21f13e18bfada58c19d094cdee1db3e3 Mon Sep 17 00:00:00 2001
From: dev_ljl <2590379346@qq.com>
Date: Tue, 16 Sep 2025 10:01:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=B7=B2=E9=A2=84=E7=BA=A6=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE=E5=AE=A4=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MeetBookingServiceImpl.java  | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java
index 99fd0112..a0d07cba 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java
@@ -29,10 +29,11 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
+import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -176,15 +177,16 @@ public class MeetBookingServiceImpl implements IMeetBookingService {
 
     @Override
     public List<MeetBookingWeekVo> appointmentIdList(String meetId) {
-        // 计算当前周的起止时间
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(new Date());
-        // 设置为周一
-        calendar.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
-        Date startOfWeek = calendar.getTime();
-        // 加6天变为周日
-        calendar.add(Calendar.DAY_OF_MONTH, 6);
-        Date endOfWeek = calendar.getTime();
+        // 获取本周一00:00:00
+        LocalDateTime startOfWeek = LocalDate.now()
+            .with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY))
+            .atStartOfDay();
+
+        // 获取本周日23:59:59
+        LocalDateTime endOfWeek = LocalDate.now()
+            .with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY))
+            .atTime(23, 59, 59, 999000000);
+
         // 构建查询条件
         LambdaQueryWrapper<MeetBooking> bookingLambdaQueryWrapper = new LambdaQueryWrapper<>();
         bookingLambdaQueryWrapper.eq(MeetBooking::getMeetId, meetId)
@@ -196,7 +198,7 @@ public class MeetBookingServiceImpl implements IMeetBookingService {
             return new ArrayList<>();
         }
         List<MeetBookingWeekVo> meetBookingWeekVoList = BeanUtil.copyToList(meetBookingVoList, MeetBookingWeekVo.class);
-        String[] weekStr = {"星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"};
+        String[] weekStr = {"星期一", "星期二", "星期三", "星期四", "星期五", "星期六","星期日"};
         List<MeetBookingWeekVo> meetBookingWeekList = new ArrayList<>();
         SimpleDateFormat df = new SimpleDateFormat("HH");
         List<ResidentUnitVo> residentUnitVolist = residentUnitMapper.selectVoList();
@@ -214,11 +216,8 @@ public class MeetBookingServiceImpl implements IMeetBookingService {
                     .filter(vo -> vo.getUserId() != null && String.valueOf(vo.getUserId()).equals(s.getPerson())).findFirst().orElse(null);
                 s.setPersonName(ObjectUtil.isNotEmpty(residentPersonVo) ? residentPersonVo.getUserName() : null);
             }
-            //设置指定的Date对象不设置默认返回当天的星期
-            calendar.setTime(s.getScheduledStarttime());
-            //获取当前时间的星期
-            int firstDayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
-            s.setWeek(weekStr[firstDayOfWeek - 1]);
+            //设置当天的星期
+            s.setWeek(weekStr[LocalDate.now().getDayOfWeek().getValue()-1]);
             String str = df.format(s.getScheduledStarttime());
             int a = Integer.parseInt(str);
             s.setSlots(a <= 12 ? "上午" : "下午");