shenzhongzheng 2 年 前
コミット
e03daa5d01

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

@@ -75,5 +75,8 @@ public class BusMeetingRoomScheduleController {
             return Result.error(e.getMessage());
         }
     }
+
+
+
 }
 

+ 1 - 2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/dto/BusMeetingRoomScheduleDetailDto.java

@@ -2,10 +2,9 @@ package org.jeecg.modules.business.dto;
 
 import lombok.Data;
 
-import java.time.LocalDateTime;
-
 @Data
 public class BusMeetingRoomScheduleDetailDto {
+    private String meetingRoomId;
     /**
      * 会议日期
      */

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

@@ -39,6 +39,8 @@ public class BusMeetingRoomScheduleDetail extends Model<BusMeetingRoomScheduleDe
      */
     private String hotelId;
 
+    private String meetingRoomId;
+
     /**
      * 预定id
      */
@@ -66,6 +68,7 @@ public class BusMeetingRoomScheduleDetail extends Model<BusMeetingRoomScheduleDe
 
     public static final String HOTEL_ID = "hotel_id";
 
+    public static final  String MEETING_ROOM_ID = "meeting_room_id";
     public static final String MEETING_ROOM_SCHEDULE_ID = "meeting_room_schedule_id";
 
     public static final String MEETING_DATE = "meeting_date";

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

@@ -61,6 +61,7 @@ public class BusMeetingRoomScheduleServiceImpl extends ServiceImpl<BusMeetingRoo
         detailList.forEach(v -> {
             BusMeetingRoomScheduleDetail detail= new BusMeetingRoomScheduleDetail();
             LocalDateTime meetingDate = LocalDate.parse(v.getMeetingDate(),struct).atStartOfDay();
+            detail.setMeetingRoomId(v.getMeetingRoomId());
             detail.setMeetingDate(meetingDate);
             detail.setTimeSpan(v.getTimeSpan().intValue());
             detail.setTenantId(tenantId);
@@ -72,4 +73,11 @@ public class BusMeetingRoomScheduleServiceImpl extends ServiceImpl<BusMeetingRoo
 
         return Result.ok("创建成功!");
     }
+
+
+
+    public  Result fetch(){
+
+        return Result.ok("");
+    }
 }