字典枚举类

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/FJLXEnum.java

@@ -0,0 +1,42 @@
+package org.dromara.common.core.enums;
+
+/**
+ * 房间类型
+ */
+public enum FJLXEnum {
+    WDY("0","未定义"),
+    SS("1","宿舍"),
+    BGS("2","办公室"),
+    JS("3","教室"),
+    SYS("4","实验室"),
+    GNS("5","功能室"),
+    QT("9","其它"),
+    CT("6","餐厅"),
+    DK("7","档口"),
+    SC("8","商超"),
+    KF("10","客房"),
+    ;
+
+    private final String code;
+    private final String name;
+
+    FJLXEnum(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public String code() {
+        return this.code;
+    }
+
+    public String message() {
+        return this.name;
+    }
+
+
+    @Override
+    public String toString() {
+        return this.name();
+    }
+
+}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/HotelRoomStatusEnum.java

@@ -0,0 +1,38 @@
+package org.dromara.common.core.enums;
+
+/**
+ * 客房状态
+ */
+public enum HotelRoomStatusEnum {
+    OK("1","OK房"),
+    ZF("2","脏房"),
+    YZ("3","住房"),
+    CS("4","超时"),
+    WX("5","维修"),
+    SF("6","锁房"),
+    YD("7","预定"),
+    ;
+
+    private final String code;
+    private final String name;
+
+    HotelRoomStatusEnum(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public String code() {
+        return this.code;
+    }
+
+    public String message() {
+        return this.name;
+    }
+
+
+    @Override
+    public String toString() {
+        return this.name();
+    }
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/service/impl/PtRoomServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.dromara.backstage.basics.domain.bo.PtRoomBatchSetBo;
 import org.dromara.backstage.basics.domain.vo.PtAreaVo;
 import org.dromara.common.core.constant.CacheNames;
+import org.dromara.common.core.enums.FJLXEnum;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -40,7 +41,7 @@ public class PtRoomServiceImpl implements IPtRoomService {
 
     private final PtAreaServiceImpl areaService;
 
-    public static final String ROOM_KF = "10";
+//    public static final String ROOM_KF = "10";
 
     /**
      * 查询房间定义
@@ -191,7 +192,7 @@ public class PtRoomServiceImpl implements IPtRoomService {
      */
     @Override
     public Boolean insertByBo(PtRoomBo bo) {
-        if(!ROOM_KF.equals(bo.getRoomType())){
+        if(!FJLXEnum.KF.code().equals(bo.getRoomType())){
             bo.setGuestRoomType(null);
         }
         PtRoom add = MapstructUtils.convert(bo, PtRoom.class);
@@ -208,8 +209,8 @@ public class PtRoomServiceImpl implements IPtRoomService {
         LambdaUpdateWrapper<PtRoom> lambdaUpdate = Wrappers.lambdaUpdate();
         lambdaUpdate.set(StringUtils.isNotBlank(bo.getRoomType()),PtRoom::getRoomType, bo.getRoomType())
             .set(StringUtils.isBlank(bo.getRoomType()),PtRoom::getRoomType, null)
-            .set(ROOM_KF.equals(bo.getRoomType()),PtRoom::getGuestRoomType, bo.getGuestRoomType())
-            .set(!ROOM_KF.equals(bo.getRoomType()),PtRoom::getGuestRoomType, null)
+            .set(FJLXEnum.KF.code().equals(bo.getRoomType()),PtRoom::getGuestRoomType, bo.getGuestRoomType())
+            .set(!FJLXEnum.KF.code().equals(bo.getRoomType()),PtRoom::getGuestRoomType, null)
             .in(PtRoom::getRoomId, bo.getRoomIds());
         int update = baseMapper.update(lambdaUpdate);
         return update>0;
@@ -225,7 +226,7 @@ public class PtRoomServiceImpl implements IPtRoomService {
     @Override
     @Transactional
     public Boolean updateByBo(PtRoomBo bo) {
-        if(!ROOM_KF.equals(bo.getRoomType())){
+        if(!FJLXEnum.KF.code().equals(bo.getRoomType())){
             bo.setGuestRoomType(null);
         }
         PtRoom update = MapstructUtils.convert(bo, PtRoom.class);