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 -3
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6932bb4fa9 - Show all commits

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

@@ -198,7 +198,6 @@ 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 = {"星期一", "星期二", "星期三", "星期四", "星期五", "星期六","星期日"};
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();
@@ -216,8 +215,6 @@ 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);
} }
//设置当天的星期
s.setWeek(weekStr[LocalDate.now().getDayOfWeek().getValue()-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 ? "上午" : "下午");