食堂评价人数统计调整

src/main/resources/mapper/assessment/AssessmentTemplatePlanMapper.xml

@@ -56,10 +56,12 @@
         t1.assessment_template_id,t3.is_confirm,t3.class_id,t4.name as class_name,
         (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) as submitted_count,
+        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
+        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) as unsubmitted_count,
+        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
+        and a2.stduy_status = t1.stduy_status AND a2.archives_status = 'FB2901') as unsubmitted_count,
         (t4.teacher_id = #{dto.teacherId}) AS is_mine,t1.is_need_confirm FROM assessment_template_plan t1
         LEFT JOIN assessment_template t2 ON t1.assessment_template_id = t2.id
         LEFT JOIN assessment_plan_answer_class t3 ON t3.assessment_template_plan_id = t1.id
@@ -91,9 +93,18 @@
     <select id="getMobilePage" parameterType="com.xjrsoft.module.assessment.dto.AssessmentTemplatePlanPageDto" resultType="com.xjrsoft.module.assessment.vo.AssessmentTemplatePlanPageVo">
         SELECT t1.id,t1.name,t1.score,t1.start_time,t1.status,t1.end_time,t2.name AS assessment_template_name,
         t1.assessment_template_id,
-        (SELECT COUNT(*) FROM assessment_plan_answer_student WHERE delete_mark = 0 AND assessment_template_plan_id = t1.id AND submit_status = 1) AS submittedCount,
-        (SELECT COUNT(*) FROM assessment_plan_answer_student WHERE delete_mark = 0 AND assessment_template_plan_id = t1.id AND (submit_status = 0 OR submit_status IS NULL)) AS unsubmittedCount,
-        (SELECT COUNT(*) FROM assessment_plan_answer_student WHERE delete_mark = 0 AND assessment_template_plan_id = t1.id) AS allCount
+        (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
+        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)
+        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
+        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
         WHERE t1.delete_mark = 0 AND t1.status in (1, 2)