1

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

@@ -79,7 +79,7 @@ public class BusMeetingRoomScheduleController {
 
 
     @ApiOperation(value="获取", notes="获取")
-    @GetMapping(value = "/fetch")
+    @PostMapping(value = "/fetch")
     public Result fetch(String startDate,String endDate,String hotelId){
         if(StringUtils.isBlank(startDate)){
             return Result.error(ResultCode.PARAM_MISS);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusMeetingRoomSchedule.java

@@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -72,6 +75,8 @@ public class BusMeetingRoomSchedule extends Model<BusMeetingRoomSchedule> {
     /**
      * 创建时间
      */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private LocalDateTime createTime;
 
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusMeetingRoomScheduleDetail.java

@@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -49,6 +52,8 @@ public class BusMeetingRoomScheduleDetail extends Model<BusMeetingRoomScheduleDe
     /**
      * 会议日期
      */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private LocalDateTime meetingDate;
 
     /**

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

@@ -41,7 +41,6 @@ public class BusMeetingRoomScheduleDetailServiceImpl extends ServiceImpl<BusMeet
 
 
 
-
     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<>();

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

@@ -149,7 +149,6 @@ public class BusMeetingRoomScheduleServiceImpl extends ServiceImpl<BusMeetingRoo
                     Optional<BusMeetingRoomSchedule> scheduleOptional =  schedules.stream().filter(sc -> sc.getId().equals(vl.getMeetingRoomScheduleId())).findFirst();
                     if(!scheduleOptional.isPresent()) return;
                     BusMeetingRoomSchedule vl_schedule =  scheduleOptional.get();
-
                     //生成数据
                     scheduleDetailVo.setTheme(vl_schedule.getTheme());
                     scheduleDetailVo.setDetail(vl);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/DTO/CesRoomSearchDto.java

@@ -5,7 +5,7 @@ import org.jeecg.common.api.dto.BasePage;
 
 @Data
 public class CesRoomSearchDto  extends BasePage {
-     private String hotelIds;
+     private String hotelId;
 
     private String buildId;
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/controller/CesAllDayRuleMinuteController.java

@@ -21,6 +21,5 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 public class CesAllDayRuleMinuteController   extends JeecgController<CesAllDayRuleMinute, CesAllDayRuleMinuteServiceImpl> {
 
-
 }
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/service/CesRoomsServiceImpl.java

@@ -66,9 +66,9 @@ public class CesRoomsServiceImpl extends ServiceImpl<CesRoomsMapper, CesRooms> i
         if(!StringUtils.isBlank(dto.getFloorId())){
             queryWrapper.eq(CesRooms.FLOOR_ID,dto.getFloorId());
         }
-        if(!StringUtils.isBlank(dto.getHotelIds())){
-           List<String> hotelIds = Arrays.stream(dto.getHotelIds().split(",")).collect(Collectors.toList());
-           queryWrapper.in(CesRooms.HOTEL_ID, hotelIds);
+        if(!StringUtils.isBlank(dto.getHotelId())){
+//           List<String> hotelIds = Arrays.stream(dto.getHotelId().split(",")).collect(Collectors.toList());
+           queryWrapper.eq(CesRooms.HOTEL_ID, dto.getHotelId());
         }
         queryWrapper.eq(CesRooms.INVALID,false);
         queryWrapper.orderByDesc(CesRooms.SORT, CesRooms.CREATEAT);