学生处分调整

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

@@ -69,4 +69,19 @@ public class BaseStudentPunishmentInfoPageVo {
 
     @ApiModelProperty("班主任名称")
     private String teacherName;
+
+    @ApiModelProperty("班级id")
+    private Long classId;
+
+    @ApiModelProperty("处理次数")
+    private Integer handleCount;
+
+    @ApiModelProperty("处理类型")
+    private String adjustType;
+
+    @ApiModelProperty("处理次数")
+    private Date adjustDate;
+
+    @ApiModelProperty("处理原因")
+    private String adjustReason;
 }

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

@@ -17,7 +17,19 @@
         t5.name,
         t5.credential_number,
         t6.name AS gender,
-        t3.name AS teacher_name
+        t3.name AS teacher_name,
+        t.class_id,
+        (SELECT adjust_type FROM base_punishment_student_handle
+        WHERE base_student_punishment_info_id = t.id
+        ORDER BY adjust_date DESC LIMIT 1) as adjust_type,
+        (SELECT adjust_date FROM base_punishment_student_handle
+        WHERE base_student_punishment_info_id = t.id
+        ORDER BY adjust_date DESC LIMIT 1) as adjust_date,
+        (SELECT adjust_reason FROM base_punishment_student_handle
+        WHERE base_student_punishment_info_id = t.id
+        ORDER BY adjust_date DESC LIMIT 1) as adjust_reason,
+        (SELECT COUNT(*) FROM base_punishment_student_handle
+        WHERE base_student_punishment_info_id = t.id) as handle_count
         FROM base_student_punishment_info t
         INNER JOIN base_punishment_type t2 ON (t2.id = t.punishment_type_id)
         INNER JOIN xjr_user t5 ON (t.user_id = t5.id)