|
@@ -14,7 +14,7 @@
|
|
|
select count(*) from base_student_scholarship_applicant
|
|
select count(*) from base_student_scholarship_applicant
|
|
|
where status = 1 and base_student_scholarship_category_id = t1.id
|
|
where status = 1 and base_student_scholarship_category_id = t1.id
|
|
|
and delete_mark = 0
|
|
and delete_mark = 0
|
|
|
- ) as applicant_count,t3.name as semester_name, t1.scholarship_level FROM base_student_scholarship_category t1
|
|
|
|
|
|
|
+ ) as applicant_count,t3.name as semester_name, t1.scholarship_level,t1.base_semester_id as semester_id FROM base_student_scholarship_category t1
|
|
|
LEFT JOIN xjr_dictionary_detail t2 ON t1.category = t2.code
|
|
LEFT JOIN xjr_dictionary_detail t2 ON t1.category = t2.code
|
|
|
left join base_semester t3 on t1.base_semester_id = t3.id
|
|
left join base_semester t3 on t1.base_semester_id = t3.id
|
|
|
WHERE t1.delete_mark = 0;
|
|
WHERE t1.delete_mark = 0;
|