1、床位调整，性别不相同不能入住寝室

2、查询床位接口增加性别筛选

src/main/java/com/xjrsoft/module/room/dto/AdjustBedPageDto.java

@@ -34,5 +34,8 @@ public class AdjustBedPageDto extends PageInput {
     @ApiModelProperty("入住班级")
     public Long classId;
 
+    @ApiModelProperty("性别")
+    public String gender;
+
 
 }

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

@@ -446,9 +446,9 @@ public class RoomBedServiceImpl extends MPJBaseServiceImpl<RoomBedMapper, RoomBe
         }
         if(!room.getGender().equals(studentGender)){
             String genderStr = "";
-            if(1 == xjrUser.getGender()){
+            if("SB10001".equals(room.getGender())){
                 genderStr = "男";
-            }else if(2 == xjrUser.getGender()){
+            }else if("SB10002".equals(room.getGender())){
                 genderStr = "女";
             }
             throw new MyException("该学生无法入住" + genderStr + "寝室");
@@ -473,9 +473,10 @@ public class RoomBedServiceImpl extends MPJBaseServiceImpl<RoomBedMapper, RoomBe
             setId(dto.getBedId());
             setStudentUserId(dto.getStudentUserId());
         }});
-
+        if(roomIds.isEmpty()){
+            return true;
+        }
         //如果寝室的人是多个班级，将混合寝室改为是
-
         List<RoomClassCountVo> classCountVoList = roomMapper.getRoomClassCount(roomIds);
         for (RoomClassCountVo roomClassCountVo : classCountVoList) {
             if(roomClassCountVo.getClassCount() > 1){

src/main/resources/mapper/room/RoomBedMapper.xml

@@ -345,6 +345,9 @@
         <if test="dto.roomName != null">
             and t2.room_name like concat('%', #{dto.roomName}, '%')
         </if>
+        <if test="dto.gender != null and dto.gender != ''">
+            and t2.gender  = #{dto.gender}
+        </if>
         <if test="dto.isMax != null">
             and t2.is_max = #{dto.isMax}
         </if>

src/main/resources/mapper/room/RoomMapper.xml

@@ -68,9 +68,12 @@
         WHERE t3.room_id = room.id GROUP BY t1.id
         ) class_data
         ) AS class_count FROM room
-        where id in
-        <foreach item="roomId" index="index" collection="ids" open="(" close=")" separator=",">
-            #{roomId}
-        </foreach>
+        where 1 = 1
+        <if test="ids != null">
+            and id in
+            <foreach item="roomId" index="index" collection="ids" open="(" close=")" separator=",">
+                #{roomId}
+            </foreach>
+        </if>
     </select>
 </mapper>