考试报告学生优秀/违纪试卷分析 复合题下多个优秀/违纪试题算一个

考试监控列表返回考试状态

sexam/src/main/java/com/xhkjedu/sexam/service/report/EReportClassService.java

@@ -276,6 +276,8 @@ public class EReportClassService {
                         List<Map> ztList = questionList.stream().filter(
                                 tq -> questionpid.equals(tq.get("questionpid"))).collect(Collectors.toList());
                         List<Map> sonques = new ArrayList<>();
+                        Integer good = 0;//优秀试卷0默认1优秀
+                        Integer bad = 0;//违纪试卷0默认1违纪
                         for (Map q2 : ztList) {
                             Map zt = new HashMap();
                             zt.put("ctype", q2.get("ctype"));
@@ -295,8 +297,16 @@ public class EReportClassService {
                             zt.put("answered", q2.get("answered"));
                             zt.put("good", q2.get("good"));
                             zt.put("bad", q2.get("bad"));
+                            if (q2.get("good").equals(1)) {
+                                good = 1;
+                            }
+                            if (q2.get("bad").equals(1)) {
+                                bad = 1;
+                            }
                             sonques.add(zt);
                         }
+                        qmap.put("good", good);
+                        qmap.put("bad", bad);
                         qmap.put("qscore", mqscore);
                         qmap.put("sonques", sonques);
                     } else {//简单题

sexam/src/main/resources/mapper/exam/ESubjectInvigilateMapper.xml

@@ -26,7 +26,7 @@
         ,truncate(count(case when eps.sstate in(1,2) then eps.epsid else null end)*100/count(eps.epsid),2) jcrate
         ,count(case when eps.sstate=2 then eps.epsid else null end)tjnum
         ,count(case when eps.sstate=3 then eps.epsid else null end)qknum
-        from(select es.esid,es.sdate,es.begintime,es.endtime,es.esstate,es.subjectname
+        from(select es.esid,es.sdate,es.begintime,es.endtime,es.esstate,es.subjectname,es.pstate
         ,eb.examname,eb.gradeid,eb.examtype,eb.examstate,max(ei.majored)majored
         ,(case when max(ei.majored)=0 then group_concat(distinct ei.classid) else group_concat(distinct ec.classid) end)classids
         ,concat('[',group_concat(distinct json_object('classid',ec.classid,'classname',ec.classname)),']')classnames

sexam/src/main/resources/mapper/report/EReportGenerateMapper.xml

@@ -44,17 +44,17 @@
     </select>
     <!--学生优秀试卷-->
     <select id="listGoodActionByExamId" resultType="java.util.Map">
-        select studentid,classid,epsq.subjectid,s.subjectname,count(epsq.epsqid)num
+        select studentid,classid,epsq.subjectid,s.subjectname,count(distinct epsq.qorder)num
         from e_paper_student_question epsq left join t_subject s on epsq.subjectid=s.subjectid
         where examid=#{examid} and good=1
-        group by studentid, subjectid, good
+        group by studentid, subjectid
     </select>
     <!--学生违规试卷-->
     <select id="listBadQuesActionByExamId" resultType="java.util.Map">
-        select studentid,classid,epsq.subjectid,s.subjectname,count(epsq.epsqid)num
+        select studentid,classid,epsq.subjectid,s.subjectname,count(distinct epsq.qorder)num
         from e_paper_student_question epsq left join t_subject s on epsq.subjectid=s.subjectid
         where examid=#{examid} and bad=1
-        group by studentid, subjectid, bad
+        group by studentid, subjectid
     </select>
     <!--获取试卷分数-->
     <select id="getScoreByExamAndSubjectId" resultType="java.lang.Double">