|
|
@@ -95,15 +95,15 @@
|
|
|
t1.assessment_template_id,
|
|
|
(select count(*) from assessment_plan_answer_student a1
|
|
|
left join base_student_school_roll a2 on a1.student_user_id = a2.user_id
|
|
|
- where a1.delete_mark = 0 and a1.assessment_template_plan_id = t1.id and a2.class_id = t3.class_id and a1.submit_status = 1
|
|
|
+ where a1.delete_mark = 0 and a1.assessment_template_plan_id = t1.id and a1.submit_status = 1
|
|
|
and a2.stduy_status = t1.stduy_status AND a2.archives_status = 'FB2901') as submitted_count,
|
|
|
(select count(*) from assessment_plan_answer_student a1
|
|
|
left join base_student_school_roll a2 on a1.student_user_id = a2.user_id
|
|
|
- where a1.delete_mark = 0 and a1.assessment_template_plan_id = t1.id and a2.class_id = t3.class_id and (a1.submit_status = 0 OR a1.submit_status IS NULL)
|
|
|
+ where a1.delete_mark = 0 and a1.assessment_template_plan_id = t1.id and (a1.submit_status = 0 OR a1.submit_status IS NULL)
|
|
|
and a2.stduy_status = t1.stduy_status AND a2.archives_status = 'FB2901') as unsubmitted_count,
|
|
|
(select count(*) from assessment_plan_answer_student a1
|
|
|
left join base_student_school_roll a2 on a1.student_user_id = a2.user_id
|
|
|
- where a1.delete_mark = 0 and a1.assessment_template_plan_id = t1.id and a2.class_id = t3.class_id
|
|
|
+ where a1.delete_mark = 0 and a1.assessment_template_plan_id = t1.id
|
|
|
and a2.stduy_status = t1.stduy_status AND a2.archives_status = 'FB2901') AS allCount
|
|
|
FROM assessment_template_plan t1
|
|
|
LEFT JOIN assessment_template t2 ON t1.assessment_template_id = t2.id
|