二期后台 bug

src/main/java/com/care/bms/service/BmsEventOrderService.java

@@ -345,7 +345,7 @@ public class BmsEventOrderService {
                 } else {//主状态不是忙碌时设置子状态和主状态相同
                     mainVO.setSubStatus(mainVO.getStatus());
                 }
-                mainVO.setSubStatusDesc(ChambStatusEnum.getCodeToName(mainVO.getSubStatus()));
+                mainVO.setSubStatusDesc(ChambSubStatusEnum.getCodeToName(mainVO.getSubStatus()));
                 chambList.add(mainVO);
             } else{ //指派了管家
                 //设置主管家子状态和主状态相同：空闲、休假、忙碌
@@ -361,9 +361,9 @@ public class BmsEventOrderService {
                 } else {//指派管家的主状态不是忙碌时设置子状态和主状态相同
                     assignVO.setSubStatus(assignVO.getStatus());
                 }
-                mainVO.setSubStatusDesc(ChambStatusEnum.getCodeToName(mainVO.getSubStatus()));
+                mainVO.setSubStatusDesc(ChambSubStatusEnum.getCodeToName(mainVO.getSubStatus()));
                 chambList.add(mainVO);
-                assignVO.setSubStatusDesc(ChambStatusEnum.getCodeToName(assignVO.getSubStatus()));
+                assignVO.setSubStatusDesc(ChambSubStatusEnum.getCodeToName(assignVO.getSubStatus()));
                 chambList.add(assignVO);
             }
         } else if(mainVO == null && assignVO != null) {
@@ -378,7 +378,7 @@ public class BmsEventOrderService {
                 assignVO.setSubStatus(assignVO.getStatus());
             }
 
-            assignVO.setSubStatusDesc(ChambStatusEnum.getCodeToName(assignVO.getSubStatus()));
+            assignVO.setSubStatusDesc(ChambSubStatusEnum.getCodeToName(assignVO.getSubStatus()));
             chambList.add(assignVO);
         }
 
@@ -687,7 +687,7 @@ public class BmsEventOrderService {
         CareEventOrder order =   this.careEventOrderService.getById(orderId);
 
         QueryWrapper<CareSysUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareSysUser::getStatus,ChambStatusEnum.FREE.getValue()).eq(CareSysUser::getRole,"chanmb").eq(CareSysUser::getOrgId,order.getOrgId()).eq(CareSysUser::getStationId,order.getStationId());
+        queryWrapper.lambda().eq(CareSysUser::getStatus,ChambStatusEnum.FREE.getValue()).eq(CareSysUser::getRole,UserRoleEnum.CHANMB.getValue()).eq(CareSysUser::getOrgId,order.getOrgId()).eq(CareSysUser::getStationId,order.getStationId());
         List<CareSysUser> list = this.careSysUserService.list(queryWrapper);
         if(CollUtil.isNotEmpty(list)){
             List<ChamberlainVO> tmp = new ArrayList<>();

src/main/java/com/care/keeper/service/KeeperOrderApiService.java

@@ -156,7 +156,7 @@ public class KeeperOrderApiService {
                 } else {//主状态不是忙碌时设置子状态和主状态相同
                     mainVO.setSubStatus(mainVO.getStatus());
                 }
-                mainVO.setSubStatusDesc(ChambStatusEnum.getCodeToName(mainVO.getSubStatus()));
+                mainVO.setSubStatusDesc(ChambSubStatusEnum.getCodeToName(mainVO.getSubStatus()));
                 chambList.add(mainVO);
             } else{ //指派了管家
                 //设置主管家子状态和主状态相同：空闲、休假、忙碌
@@ -172,9 +172,9 @@ public class KeeperOrderApiService {
                 } else {//指派管家的主状态不是忙碌时设置子状态和主状态相同
                     assignVO.setSubStatus(assignVO.getStatus());
                 }
-                mainVO.setSubStatusDesc(ChambStatusEnum.getCodeToName(mainVO.getSubStatus()));
+                mainVO.setSubStatusDesc(ChambSubStatusEnum.getCodeToName(mainVO.getSubStatus()));
                 chambList.add(mainVO);
-                assignVO.setSubStatusDesc(ChambStatusEnum.getCodeToName(assignVO.getSubStatus()));
+                assignVO.setSubStatusDesc(ChambSubStatusEnum.getCodeToName(assignVO.getSubStatus()));
                 chambList.add(assignVO);
             }
         } else if(mainVO == null && assignVO != null) {
@@ -189,7 +189,7 @@ public class KeeperOrderApiService {
                 assignVO.setSubStatus(assignVO.getStatus());
             }
 
-            assignVO.setSubStatusDesc(ChambStatusEnum.getCodeToName(assignVO.getSubStatus()));
+            assignVO.setSubStatusDesc(ChambSubStatusEnum.getCodeToName(assignVO.getSubStatus()));
             chambList.add(assignVO);
         }