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

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

@@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.write.style.ContentStyle;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
 * @title: 移动端学生修改信息列表
 * @Author dzx
@@ -50,14 +52,60 @@ public class BaseStudentInfoPageVo {
     private String className;
 
     /**
-     * 性别
+     * 学习形式
      */
-    @ApiModelProperty("性别")
-    private String genderCn;
-
+    @ApiModelProperty("学习形式")
+    private String rollModality;
+    /**
+     * 学习形式
+     */
+    @ApiModelProperty("学习形式")
+    private String rollModalityCode;
+    /**
+     * 学籍状态(xjr_dictionary_item[archives_status])
+     */
+    @ApiModelProperty("学籍状态(xjr_dictionary_item[archives_status])")
+    private String archivesStatus;
+    /**
+     * 学籍状态(xjr_dictionary_item[archives_status])
+     */
+    @ApiModelProperty("学籍状态(xjr_dictionary_item[archives_status])")
+    private String archivesStatusCode;
     /**
      * 就读方式(xjr_dictionary_item[stduy_status])
      */
     @ApiModelProperty("就读方式(xjr_dictionary_item[stduy_status])")
     private String stduyStatus;
+
+    /**
+     * 就读方式(xjr_dictionary_item[stduy_status])
+     */
+    @ApiModelProperty("就读方式(xjr_dictionary_item[stduy_status])")
+    private String stduyStatusCode;
+
+    @ApiModelProperty("床位信息")
+    private String bedInfo;
+
+    @ApiModelProperty("头像")
+    private String avatar;
+
+    @ApiModelProperty("出生日期")
+    private Date birthDate;
+
+    @ApiModelProperty("民族")
+    private String nation;
+
+    private String majorSetName;
+
+    /**
+     * 性别
+     */
+    @ApiModelProperty("性别")
+    private String gender;
+
+    /**
+     * 性别中文
+     */
+    @ApiModelProperty("性别中文")
+    private String genderCn;
 }

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

@@ -8,11 +8,28 @@
             t2.name AS student_name,
             t1.student_id,
             t2.mobile AS phone,
-            t5.mobile AS teacher_phone,t5.name as teacher_name,
+            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
+            (SELECT mobile
+            FROM base_student_family_member
+            WHERE delete_mark = 0
+            AND user_id = t2.id
+            AND is_guardian = 1) AS guardian_phone,
+            t7.name AS gender_cn,
+            t8.name AS stduyStatus,
+            t2.gender,
+            t11.name AS genderCn,
+            t2.birth_date,
+            t2.avatar,
+            t6.name AS nation,
+            t10.name AS major_set_name,
+            t3.archives_status AS archives_status,
+            t3.stduy_status AS stduy_status,
+            t3.roll_modality AS roll_modality,
+            t3.archives_status AS archivesStatusCode,
+            t3.stduy_status AS stduyStatusCode,
+            t3.roll_modality AS rollModalityCode
         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