fix

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

@@ -1,6 +1,8 @@
 package org.jeecg.modules.business.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.jeecg.common.util.TokenUtils;
 import org.jeecg.modules.business.entity.BusMeetingRoomScheduleDetail;
 import org.jeecg.modules.business.mapper.BusMeetingRoomScheduleDetailMapper;
 import org.jeecg.modules.business.service.IBusMeetingRoomScheduleDetailService;
@@ -8,6 +10,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -34,4 +38,15 @@ public class BusMeetingRoomScheduleDetailServiceImpl extends ServiceImpl<BusMeet
         if(CollectionUtil.isEmpty(detailList)) return false;
         return saveBatch(detailList);
     }
+
+
+
+    public List<BusMeetingRoomScheduleDetail> fetchByDateRange(LocalDateTime startDate, LocalDateTime endDate,String hotelId){
+        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);
+
+        return new ArrayList<>();
+    }
 }

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

@@ -17,6 +17,7 @@ import javax.annotation.Resource;
 import javax.transaction.Transactional;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
@@ -69,14 +70,27 @@ public class BusMeetingRoomScheduleServiceImpl extends ServiceImpl<BusMeetingRoo
             detail.setHotelId(hotelId);
             details.add(detail);
         });
-        meetingRoomScheduleDetailService.saveBatch(details);
+        meetingRoomScheduleDetailService.saveBatchDetail(details);
 
         return Result.ok("创建成功!");
     }
 
 
+    /**
+     * 查询 创建数据
+     * @param startDate
+     * @param endDate
+     * @param viewType
+     * @return
+     */
+    public  Result fetch(String startDate,String endDate, Integer viewType,String hotelId){
+        DateTimeFormatter struct = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime startTime = LocalDate.parse(startDate,struct).atStartOfDay();
+        LocalDate endLocalDate = LocalDate.parse(endDate,struct);
+        LocalDateTime endTime = LocalDateTime.of(endLocalDate, LocalTime.of(23,59,59));;
+
+//        List<>meetingRoomScheduleDetailService.fetchByDateRange(startTime,endTime, hotelId);
 
-    public  Result fetch(){
 
         return Result.ok("");
     }

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

@@ -1,5 +1,7 @@
 package org.jeecg.modules.business.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.jeecg.modules.business.entity.BusMeetingRoom;
 import org.jeecg.modules.business.mapper.BusMeetingRoomMapper;
 import org.jeecg.modules.business.service.IBusMeetingRoomService;
@@ -7,6 +9,10 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @Description: bus_meeting_room
  * @Author: jeecg-boot
@@ -16,4 +22,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class BusMeetingRoomServiceImpl extends ServiceImpl<BusMeetingRoomMapper, BusMeetingRoom> implements IBusMeetingRoomService {
 
+    @Resource
+    private BusMeetingRoomMapper busMeetingRoomMapper;
+
+    /**
+     * 获取当前酒店的所有启用的 会议室数据
+     * @param hotelId
+     * @return
+     */
+    public List<BusMeetingRoom> fetch(String hotelId){
+        if(StringUtils.isBlank(hotelId)) return new ArrayList<>();
+        return busMeetingRoomMapper.selectList(Wrappers.<BusMeetingRoom>lambdaQuery().eq(BusMeetingRoom::getHotelId,hotelId).eq(BusMeetingRoom::getStatus, 1));
+    }
 }

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

@@ -0,0 +1,17 @@
+package org.jeecg.modules.business.vo;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class BusMeetingRoomScheduleDetailVo {
+    /**
+     * 上午 中午 下午
+     */
+     private Integer timePeriod;
+
+     public List<Map<List<String>,List<Object>>> schedule;
+
+}

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

@@ -0,0 +1,21 @@
+package org.jeecg.modules.business.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 会议室预定 前端VO
+ */
+@Data
+public class BusMeetingRoomScheduleVo {
+
+    /**
+     * 会议室名称
+     */
+    private String meetingRoomName;
+
+    private String id;
+
+    private List<BusMeetingRoomScheduleDetailVo>  child;
+ }