食堂评价导出调整

src/main/java/com/xjrsoft/module/assessment/mapper/AssessmentPlanAnswerStudentMapper.java

@@ -35,7 +35,7 @@ public interface AssessmentPlanAnswerStudentMapper extends MPJBaseMapper<Assessm
             " INNER JOIN base_student_school_roll t2 ON t1.student_user_id = t2.user_id" +
             " INNER JOIN assessment_template_plan t3 ON t1.assessment_template_plan_id = t3.id" +
             " WHERE t1.delete_mark = 0 AND t1.assessment_template_plan_id = #{id}" +
-            " AND t3.stduy_status = t2.stduy_status AND t2.archives_status = 'FB2901'")
+            " AND t3.stduy_status like concat('%', t2.stduy_status,'%') AND t2.archives_status = 'FB2901'")
     Integer getStudentCount(Long id);
 
     @Select("SELECT submit_status FROM assessment_plan_answer_student WHERE delete_mark = 0 AND assessment_template_plan_id = #{id} and student_user_id = #{loginId}")

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

@@ -57,11 +57,11 @@
         (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,
+        and t1.stduy_status like concat('%', a2.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
-        and a2.stduy_status = t1.stduy_status AND a2.archives_status = 'FB2901') as unsubmitted_count,
+        and t1.stduy_status like concat('%', a2.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
@@ -96,15 +96,15 @@
         (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 a1.submit_status = 1
-        and a2.stduy_status = t1.stduy_status AND a2.archives_status = 'FB2901') as submitted_count,
+        and t1.stduy_status like concat('%', a2.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 (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,
+        and t1.stduy_status like concat('%', a2.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.stduy_status = t1.stduy_status AND a2.archives_status = 'FB2901') AS allCount
+        and t1.stduy_status like concat('%', a2.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)