分配床位增加班级列表，增加入住性别查询

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

@@ -22,4 +22,7 @@ public class DistributeClassPageDto extends PageInput {
     @ApiModelProperty("年级id")
     public Long classId;
 
+    @ApiModelProperty("入住性别")
+    public String gender;
+
 }

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

@@ -53,12 +53,31 @@
         (SELECT COUNT(*) FROM base_student c1
         LEFT JOIN base_student_school_roll c2 ON c1.user_id = c2.user_id
         LEFT JOIN xjr_dictionary_detail c3 ON c2.stduy_status = c3.code AND c3.item_id = 2023000000000000030
+        left join xjr_user c4 on c1.user_id = c4.id
         WHERE c1.delete_mark = 0 AND c2.delete_mark = 0
-        AND c3.code = 'FB3002' AND c2.class_id = t1.id) AS need_count,(
+        AND c3.code = 'FB3002' AND c2.class_id = t1.id
+        <if test="dto.gender != null">
+            <if test="dto.gender == 'SB10001'">
+                and c4.gender = 1
+            </if>
+            <if test="dto.gender == 'SB10002'">
+                and c4.gender = 2
+            </if>
+        </if>
+        ) AS need_count,(
         SELECT COUNT(*) FROM room_bed a1
         LEFT JOIN base_student_school_roll a2 ON a1.student_user_id = a2.user_id
+        left join xjr_user c4 on a2.user_id = c4.id
         WHERE a1.delete_mark = 0 AND a2.delete_mark = 0
         AND a2.class_id = t1.id
+        <if test="dto.gender != null">
+            <if test="dto.gender == 'SB10001'">
+                and c4.gender = 1
+            </if>
+            <if test="dto.gender == 'SB10002'">
+                and c4.gender = 2
+            </if>
+        </if>
         ) AS distribute_count FROM base_class t1
         LEFT JOIN base_grade t2 ON t1.grade_id = t2.id
         LEFT JOIN xjr_department t3 ON t1.org_id = t3.id
@@ -82,6 +101,7 @@
         <if test="dto.classId != null">
             and t1.id = #{dto.classId}
         </if>
+
     </select>
     <select id="getDistributeRoomBedInfo" parameterType="com.xjrsoft.module.room.dto.DistributeRoomBedPageDto" resultType="com.xjrsoft.module.room.vo.DistributeRoomBedPageVo">
         SELECT t1.id,t1.sort_code,t2.name AS build_name,t1.floor_number,t1.room_name,t4.name AS gender_cn, t3.name AS check_in_status_cn,