Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/room/service/IRoomBedService.java

@@ -106,7 +106,4 @@ public interface IRoomBedService extends MPJBaseService<RoomBed> {
      * @param dtoList 批量传入学生id和床位id
      */
     Boolean adjustBedBatch(List<AdjustStudentBedDto> dtoList);
-
-
-
 }

src/main/java/com/xjrsoft/module/student/vo/BaseStudentInfoPageVo.java

@@ -49,4 +49,15 @@ public class BaseStudentInfoPageVo {
     @ApiModelProperty("班级名称")
     private String className;
 
+    /**
+     * 性别
+     */
+    @ApiModelProperty("性别")
+    private String genderCn;
+
+    /**
+     * 就读方式(xjr_dictionary_item[stduy_status])
+     */
+    @ApiModelProperty("就读方式(xjr_dictionary_item[stduy_status])")
+    private String stduyStatus;
 }

src/main/resources/mapper/student/BaseStudentSchoolRollMapper.xml

@@ -5,21 +5,25 @@
 <mapper namespace="com.xjrsoft.module.student.mapper.BaseStudentSchoolRollMapper">
     <select id="getMobilePage" parameterType="com.xjrsoft.module.student.dto.BaseStudentInfoPageDto" resultType="com.xjrsoft.module.student.vo.BaseStudentInfoPageVo">
         SELECT t2.id,
-        t2.name AS student_name,
-        t1.student_id,
-        t2.mobile AS phone,
-        t5.mobile AS teacher_phone,t5.name as teacher_name,
-        t4.name AS class_name,
-        t6.mobile AS guardian_phone
+            t2.name AS student_name,
+            t1.student_id,
+            t2.mobile AS phone,
+            t5.mobile AS teacher_phone,t5.name as teacher_name,
+            t4.name AS class_name,
+            t6.mobile AS guardian_phone,
+            t7.name as gender_cn,
+            t8.name as stduyStatus
         FROM base_student t1
-        INNER JOIN xjr_user t2 ON t1.user_id = t2.id
-        INNER JOIN base_student_school_roll t3 ON t1.user_id = t3.user_id
-        LEFT JOIN base_class t4 ON t3.class_id = t4.id
-        LEFT JOIN xjr_user t5 ON t4.teacher_id = t5.id
-        LEFT JOIN base_student_family_member t6 ON t6.user_id = t2.id AND t6.delete_mark = 0 AND t6.is_guardian = 1
+            INNER JOIN xjr_user t2 ON t1.user_id = t2.id
+            INNER JOIN base_student_school_roll t3 ON t1.user_id = t3.user_id
+            LEFT JOIN base_class t4 ON t3.class_id = t4.id
+            LEFT JOIN xjr_user t5 ON t4.teacher_id = t5.id
+            LEFT JOIN base_student_family_member t6 ON t6.user_id = t2.id AND t6.delete_mark = 0 AND t6.is_guardian = 1
+            Left JOIN xjr_dictionary_detail t7 ON t7.code = t2.gender
+            Left JOIN xjr_dictionary_detail t8 ON t8.code = t3.stduy_status
         WHERE t2.delete_mark = 0
-        AND t1.delete_mark = 0
-        AND t3.archives_status = 'FB2901'
+            AND t1.delete_mark = 0
+            AND t3.archives_status = 'FB2901'
         <if test="dto.gradeId != null">
             and t4.grade_id = #{dto.gradeId}
         </if>