床位管理性别调整

src/main/java/com/xjrsoft/module/room/service/impl/RoomBedServiceImpl.java

@@ -263,21 +263,9 @@ public class RoomBedServiceImpl extends MPJBaseServiceImpl<RoomBedMapper, RoomBe
     @Override
     public Boolean distributeRoomBed(DistributeRoomBedDto dto) {
         List<Room> roomList = roomMapper.selectList(new QueryWrapper<Room>().lambda().in(Room::getId, dto.getRoomIds()));
-        Set<Integer> genderSet = new HashSet<>();
+        Set<String> genderSet = new HashSet<>();
         for (Room room : roomList) {
-            if("SB10001".equals(room.getGender())){
-                genderSet.add(1);
-            }else if("SB10002".equals(room.getGender())){
-                genderSet.add(2);
-            }
-        }
-        Map<Integer, String> genderMap = new HashMap<>();
-        for (Integer genderNumber : genderSet) {
-            if(genderNumber == 1){
-                genderMap.put(genderNumber, "SB10001");
-            }else if(genderNumber == 2){
-                genderMap.put(genderNumber, "SB10002");
-            }
+            genderSet.add(room.getGender());
         }
 
         Date modifyDate = new Date();
@@ -287,14 +275,14 @@ public class RoomBedServiceImpl extends MPJBaseServiceImpl<RoomBedMapper, RoomBe
         int i = 0;
         Map<Long, Integer> classDistributeBedNumber = new HashMap<>();
         Map<Long, Integer> classStudent = new HashMap<>();
-        for (Integer genderNumber : genderSet) {
+        for (String genderNumber : genderSet) {
             //根据性别查询出所有空床位信息
             List<RoomBed> bedInfoList = roomBedMapper.selectList(
                 new MPJLambdaWrapper<RoomBed>()
                 .select(RoomBed::getId)
                 .select(RoomBed.class, x -> VoToColumnUtil.fieldsToColumns(RoomBed.class).contains(x.getProperty()))
                 .innerJoin(Room.class, Room::getId, RoomBed::getRoomId)
-                .eq(Room::getGender, genderMap.get(genderNumber))
+                .eq(Room::getGender, genderNumber)
                 .isNull(RoomBed::getStudentUserId)
                 .eq(RoomBed::getIsCheckIn, 0)
                 .in(RoomBed::getRoomId, dto.getRoomIds())