|
|
@@ -8,14 +8,14 @@
|
|
|
(SELECT COUNT(*) FROM base_new_student WHERE delete_mark = 0 AND first_ambition_id = t1.major_set_id) AS first_ambition_count,
|
|
|
(SELECT COUNT(*) FROM base_new_student WHERE delete_mark = 0 AND second_ambition_id = t1.major_set_id) AS second_ambition_count,
|
|
|
t1.height, t1.score, (
|
|
|
- SELECT count(t1.id) FROM base_new_student t1
|
|
|
- INNER JOIN banding_task_class_student t5 ON t1.id = t5.new_student_id
|
|
|
- WHERE t1.delete_mark = 0 AND t5.delete_mark = 0 AND t5.banding_task_class_id = t1.id
|
|
|
+ SELECT count(a1.id) FROM base_new_student a1
|
|
|
+ INNER JOIN banding_task_class_student t5 ON a1.id = t5.new_student_id
|
|
|
+ WHERE a1.delete_mark = 0 AND t5.delete_mark = 0 AND t5.banding_task_class_id = t1.id
|
|
|
) as satisfy_count, (
|
|
|
- SELECT count(t1.id) FROM base_new_student t1
|
|
|
- WHERE t1.delete_mark = 0
|
|
|
- AND (t1.first_ambition_id = t1.major_set_id or t1.second_ambition_id = t1.major_set_id
|
|
|
- and t1.id not in (select new_student_id from banding_task_class_student
|
|
|
+ SELECT count(a1.id) FROM base_new_student a1
|
|
|
+ WHERE a1.delete_mark = 0
|
|
|
+ AND (a1.first_ambition_id = t1.major_set_id or a1.second_ambition_id = t1.major_set_id)
|
|
|
+ and a1.id not in (select new_student_id from banding_task_class_student
|
|
|
where delete_mark = 0 and banding_task_class_id = t1.id
|
|
|
)
|
|
|
) as surplus_count, t3.name as teacher_name,t3.id as teacher_id, t4.name as classroom_name,t4.id as classroom_id FROM banding_task_class t1
|