Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-backend

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

@@ -10,7 +10,10 @@ import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.TokenUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.business.entity.BusMeetingRoom;
 import org.jeecg.modules.business.service.IBusMeetingRoomService;
@@ -84,6 +87,13 @@ public class BusMeetingRoomController extends JeecgController<BusMeetingRoom, IB
 	//@RequiresPermissions("business:bus_meeting_room:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody BusMeetingRoom busMeetingRoom) {
+		LoginUser user = TokenUtils.getAuthUser();
+		if (user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")) {
+			busMeetingRoom.setTenantId(user.getRelTenantIds());
+		} else {
+			throw new JeecgBootException("当前登录人租户信息错误");
+		}
+		busMeetingRoom.setStatus(1);
 		busMeetingRoomService.save(busMeetingRoom);
 		return Result.OK("添加成功！");
 	}

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

@@ -4,12 +4,9 @@ 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>
@@ -75,8 +72,6 @@ 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,12 +4,9 @@ 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>
@@ -52,8 +49,6 @@ 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/enums/CouponsKeyEnum.java

@@ -1,58 +0,0 @@
-package org.jeecg.modules.business.enums;
-
-import org.jeecg.common.system.annotation.EnumDict;
-import org.jeecg.common.system.vo.DictModel;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-@EnumDict("couponsKeyEnum")
-public enum CouponsKeyEnum {
-
-    AM(1, "上午"),
-    MO(2, "中午"),
-    DE(3, "晚上");
-
-    Integer key;
-
-    String title;
-
-    CouponsKeyEnum(Integer key, String title){
-        this.key = key;
-        this.title = title;
-    }
-    public Integer getKey() {
-        return key;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * 获取字典数据
-     * @return
-     */
-    public static List<DictModel> getDictList(){
-        List<DictModel> list = new ArrayList<>();
-        DictModel dictModel = null;
-        for(CouponsKeyEnum e: CouponsKeyEnum.values()){
-            dictModel = new DictModel();
-            dictModel.setValue(e.key.toString());
-            dictModel.setText(e.title);
-            list.add(dictModel);
-        }
-        return list;
-    }
-
-    public static CouponsKeyEnum val(Integer key){
-        for(CouponsKeyEnum bld: values()){
-            if(bld.key == key){
-                return bld;
-            }
-        }
-        return null;
-    }
-
-}

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

@@ -41,6 +41,7 @@ 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/vo/BusMeetingKeyValueVo.java

@@ -1,12 +0,0 @@
-package org.jeecg.modules.business.vo;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class BusMeetingKeyValueVo {
-    private String key;
-
-    private List<MeetingRoomScheduleDetailVo> value;
-}

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

@@ -1,13 +0,0 @@
-package org.jeecg.modules.business.vo;
-
-import lombok.Data;
-import org.jeecg.modules.business.entity.BusMeetingRoomSchedule;
-import org.jeecg.modules.business.entity.BusMeetingRoomScheduleDetail;
-
-@Data
-public class MeetingRoomScheduleDetailVo {
-        private String theme;// 主题
-        private BusMeetingRoomSchedule roomSchedule;
-
-        private BusMeetingRoomScheduleDetail detail;
-}

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 hotelId;
+     private String hotelIds;
 
     private String buildId;
 

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

@@ -21,5 +21,6 @@ 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.getHotelId())){
-//           List<String> hotelIds = Arrays.stream(dto.getHotelId().split(",")).collect(Collectors.toList());
-           queryWrapper.eq(CesRooms.HOTEL_ID, dto.getHotelId());
+        if(!StringUtils.isBlank(dto.getHotelIds())){
+           List<String> hotelIds = Arrays.stream(dto.getHotelIds().split(",")).collect(Collectors.toList());
+           queryWrapper.in(CesRooms.HOTEL_ID, hotelIds);
         }
         queryWrapper.eq(CesRooms.INVALID,false);
         queryWrapper.orderByDesc(CesRooms.SORT, CesRooms.CREATEAT);