奖助学金导入

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

@@ -63,4 +63,8 @@ public class BaseStudentSompleInfoVo {
     @ContentStyle(dataFormat = 49)
     @ApiModelProperty("班主任工号")
     private String teacherUserName;
+
+    @ContentStyle(dataFormat = 49)
+    @ApiModelProperty("教师名称")
+    private String classroomName;
 }

src/main/resources/mapper/organization/UserMapper.xml

@@ -19,11 +19,12 @@
         SELECT t1.id, t1.name as student_name, t1.enabled_mark, t1.credential_number, t4.name AS class_name,t1.mobile,
         (SELECT name FROM base_student_family_member WHERE delete_mark = 0 AND user_id = t1.id ORDER BY create_date ASC LIMIT 0,1) as parent_name,
         (SELECT mobile FROM base_student_family_member WHERE delete_mark = 0 AND user_id = t1.id ORDER BY create_date ASC LIMIT 0,1) as parent_mobile,
-        t1.gender,t4.id as class_id, t4.teacher_id,t5.name as teacher_name,t5.user_name as teacher_user_name,t5.mobile as teacher_mobile
+        t1.gender,t4.id as class_id, t4.teacher_id,t5.name as teacher_name,t5.user_name as teacher_user_name,t5.mobile as teacher_mobile,t5.name as classroom_name
         FROM xjr_user t1
         INNER JOIN base_student t2 ON t1.id = t2.user_id
         INNER JOIN base_student_school_roll t3 ON t1.id = t3.user_id
         INNER JOIN base_class t4 ON t4.id = t3.class_id
+        left join base_classroom t5 on t4.classroom_id = t5.id
         left join xjr_user t5 on t4.teacher_id = t5.id
         WHERE t1.delete_mark = 0
         <if test="dto.keyword != null and dto.keyword != ''">