Merge remote-tracking branch 'cloud-schoolapi/ywx'

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

@@ -94,27 +94,6 @@ public class EReportClassService {
         map.put("gzxsList", gzxsList);
         List<Map> gpctList = eRclassMapper.listGpCt(rank);//高频错题
         for (Map ct : gpctList) {
-            //高频错误项
-            Integer ctype = (Integer) ct.get("ctype");
-            String gpcwx = "";
-            if (N_Utils.isObjectiveQuestion(ctype)) {
-                String answerjson = ct.get("answerjson").toString();//学生作答情况
-                String answer = JSON.parseArray(ct.get("answer").toString(), String.class).get(0);//正确答案
-                Map amap = JSON.parseObject(answerjson, Map.class);
-                List<Map<String, Integer>> list = new ArrayList<>();
-                Integer cwnum = 0;//作答错误学生数量
-                for (Object o : amap.keySet()) {
-                    List<Map> o1 = (List<Map>) amap.get(o);
-                    int answernum = o1.size();//作答学生数量
-                    String xx = o.toString();//选项
-                    if (!answer.equals(xx) && cwnum.compareTo(answernum) == -1) {
-                        cwnum = answernum;
-                        gpcwx = xx;
-                    }
-                }
-            }
-            ct.put("gpcwx", gpcwx);
-
             //知识点
             setQuestionPoint(ct);
 

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

@@ -66,12 +66,13 @@
     </select>
     <!--班级报告-单科概况-高频错题-->
     <select id="listGpCt" resultType="java.util.Map">
-        select erq.eptqid,erq.qn,erq.classsrate,erq.gradesrate,erq.answerjson
-        ,epq.eptname,epqq.ctype,epqq.answer,epa.pointjson
+        select erq.eptqid,erq.qn,erq.classsrate,erq.gradesrate,erq.answerjson,erq.erroroption
+        ,epq.eptname,epq.ctype,epqq.answer,epa.pointjson
         from e_rclass_question erq left join e_paper_qtype_question epqq on erq.epid = epqq.epid and erq.qorder=epqq.qorder
         left join e_paper_qtype epq on epqq.eptid = epq.eptid
         left join e_paper_analyze epa on erq.epid = epa.epid
         where erq.examid=#{rank.examid} and erq.classid=#{rank.classid}
         and erq.subjectid=#{rank.subjectid} and erq.classsrate&lt;40
+        group by erq.qorder
     </select>
 </mapper>