|
|
@@ -19,15 +19,15 @@
|
|
|
t6.name AS gender,
|
|
|
t3.name AS teacher_name,
|
|
|
t.class_id,
|
|
|
- (SELECT adjust_type FROM base_punishment_student_handle
|
|
|
+ (SELECT replace(replace(replace(adjust_type,1,'升级'),2,'降级'),3,'撤销') FROM base_punishment_student_handle
|
|
|
WHERE base_student_punishment_info_id = t.id
|
|
|
- ORDER BY adjust_date DESC LIMIT 1) as adjust_type,
|
|
|
+ ORDER BY adjust_date DESC,id 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,
|
|
|
+ ORDER BY adjust_date DESC,id 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,
|
|
|
+ ORDER BY adjust_date DESC,id 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
|
|
|
@@ -103,15 +103,15 @@
|
|
|
t3.name AS teacher_name,
|
|
|
t.class_id,
|
|
|
t8.name as major,
|
|
|
- (SELECT adjust_type FROM base_punishment_student_handle
|
|
|
+ (SELECT replace(replace(replace(adjust_type,1,'升级'),2,'降级'),3,'撤销') FROM base_punishment_student_handle
|
|
|
WHERE base_student_punishment_info_id = t.id
|
|
|
- ORDER BY adjust_date DESC LIMIT 1) as adjust_type,
|
|
|
+ ORDER BY adjust_date DESC,id 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,
|
|
|
+ ORDER BY adjust_date DESC,id 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,
|
|
|
+ ORDER BY adjust_date DESC,id 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
|