by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

master #13

Merged
lsm merged 5 commits from master into prod 2025-09-17 17:05:48 +08:00
Conversation 0 Commits 5 Files Changed 3 +15 -16
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 65c5d33a21 - Show all commits

31
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java
View File

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