1

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusMeetingRoomScheduleController.java

@@ -78,5 +78,25 @@ public class BusMeetingRoomScheduleController {
 
 
 
+    @ApiOperation(value="获取", notes="获取")
+    @PostMapping(value = "/fetch")
+    public Result fetch(String startDate,String endDate,String hotelId){
+        if(StringUtils.isBlank(startDate)){
+            return Result.error(ResultCode.PARAM_MISS);
+        }
+        if(StringUtils.isBlank(endDate)){
+            return Result.error(ResultCode.PARAM_MISS);
+        }
+        if(StringUtils.isBlank(hotelId)){
+            return Result.error(ResultCode.PARAM_MISS);
+        }
+        try {
+            return roomScheduleService.fetch(startDate,endDate,hotelId);
+        }catch (Exception e){
+            return Result.error(e.getMessage());
+        }
+    }
+
+
 }
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusMeetingRoomScheduleDetailServiceImpl.java

@@ -41,12 +41,15 @@ public class BusMeetingRoomScheduleDetailServiceImpl extends ServiceImpl<BusMeet
 
 
 
-    public List<BusMeetingRoomScheduleDetail> fetchByDateRange(LocalDateTime startDate, LocalDateTime endDate,String hotelId){
+
+    public List<BusMeetingRoomScheduleDetail> fetchByDateRange(LocalDateTime startDate, LocalDateTime endDate,String hotelId,List<String> meetRoomIds){
+        if(CollectionUtil.isEmpty(meetRoomIds)) return new ArrayList<>();
         QueryWrapper<BusMeetingRoomScheduleDetail> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(BusMeetingRoomScheduleDetail.TENANT_ID, TokenUtils.currentTenantId());
         queryWrapper.eq(BusMeetingRoomScheduleDetail.HOTEL_ID,hotelId);
         queryWrapper.between(BusMeetingRoomScheduleDetail.MEETING_DATE, startDate,endDate);
+        queryWrapper.in(BusMeetingRoomScheduleDetail.MEETING_ROOM_ID,meetRoomIds);
 
-        return new ArrayList<>();
+        return scheduleDetailMapper.selectList(queryWrapper);
     }
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/BusMeetingRoomScheduleDetailVo.java

@@ -10,8 +10,8 @@ public class BusMeetingRoomScheduleDetailVo {
     /**
      * 上午 中午 下午
      */
-     private Integer timePeriod;
+     private String timePeriod;
 
-     public List<Map<List<String>,List<Object>>> schedule;
+     public List<BusMeetingKeyValueVo> schedule;
 
 }