|
@@ -8,11 +8,11 @@
|
|
|
(SELECT COUNT(*) FROM base_new_student a1
|
|
|
INNER JOIN enrollment_plan a2 ON a1.enrollment_plan_id = a2.id
|
|
|
WHERE a1.delete_mark = 0 AND a1.first_ambition_id = t1.major_set_id
|
|
|
- AND a2.enroll_type = #{enrollType} AND a2.grade_id =#{gradeId} ) AS first_ambition_count,
|
|
|
+ AND a2.enroll_type = #{dto.enrollType} AND a2.grade_id =#{dto.gradeId} ) AS first_ambition_count,
|
|
|
(SELECT COUNT(*) FROM base_new_student a1
|
|
|
INNER JOIN enrollment_plan a2 ON a1.enrollment_plan_id = a2.id
|
|
|
WHERE a1.delete_mark = 0 AND a1.second_ambition_id = t1.major_set_id
|
|
|
- AND a2.enroll_type = #{enrollType} AND a2.grade_id =#{gradeId} ) AS second_ambition_count,
|
|
|
+ AND a2.enroll_type = #{dto.enrollType} AND a2.grade_id =#{dto.gradeId} ) AS second_ambition_count,
|
|
|
t5.height, t5.score, (
|
|
|
SELECT count(a1.id) FROM base_new_student a1
|
|
|
INNER JOIN banding_task_class_student t5 ON a1.id = t5.new_student_id
|