班级报告题库试卷概况

sexam/src/main/java/com/xhkjedu/sexam/mapper/reportclass/EReportClassMapper.java

@@ -34,4 +34,7 @@ public interface EReportClassMapper {
 
     //学生试卷基础信息
     Map getStuPaperInfo(@Param("rank") ERankParamVo rank);
+
+    //题库试题
+    List<Map> listTkQuestion(@Param("epid") Integer epid);
 }

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

@@ -139,15 +139,25 @@ public class EReportClassService {
                 String pointname = p.get("pointname").toString();
                 List<Map> qlist = JSON.parseArray(ques, Map.class);
                 for (Map q : qlist) {
-                    List<Integer> eptqids = JSON.parseArray(q.get("eptqids").toString(), Integer.class);
-                    if (N_Utils.numInList(eptqid, eptqids)) {
-                        pointnames.add(pointname);
-                        break;
+                    if (N_Utils.isEmptyInteger(eptqid)) {
+                        String qn = ct.get("qn").toString();
+                        String[] qnList = qn.split(",");
+                        List<String> qns = JSON.parseArray(q.get("qns").toString(), String.class);
+                        for (String num : qnList) {
+                            if (qns.contains(num)) {
+                                pointnames.add(pointname);
+                            }
+                        }
+                    } else {
+                        List<Integer> eptqids = JSON.parseArray(q.get("eptqids").toString(), Integer.class);
+                        if (N_Utils.numInList(eptqid, eptqids)) {
+                            pointnames.add(pointname);
+                        }
                     }
                 }
             }
         }
-        ct.put("pointnames", pointnames);
+        ct.put("pointnames", pointnames.stream().distinct().collect(Collectors.toList()));
     }
 
     //单科概况-需关注学生
@@ -161,8 +171,49 @@ public class EReportClassService {
         Integer ptype = (Integer) paper.get("ptype");
         if (ptype == 1) {
             List<Map> list = eReportClassMapper.listTkSjGk(rank);
+            List<Map> questions = eReportClassMapper.listTkQuestion((Integer) paper.get("epid"));
+            Object pointjson = paper.get("pointjson");
             for (Map q : list) {
+                q.put("pointjson", pointjson);
                 setQuestionPoint(q);//试题知识点
+                Object questionid = q.get("questionid");
+                Map qmap;
+                if (N_Utils.isEmpty(q.get("eptqid"))) {
+                    qmap = questions.stream().filter(tq -> questionid.equals(tq.get("mquestionid"))).findFirst().orElse(null);
+                    q.put("ctype", qmap.get("mctype"));
+                    q.put("qtypename", qmap.get("mqtypename"));
+                    q.put("qstem", qmap.get("mqstem"));
+                    q.put("qanalyze", qmap.get("mqanalyze"));
+                    q.put("hashear", qmap.get("mhashear"));
+                    q.put("hearfile", qmap.get("mhearfile"));
+                    List<Map> sonques = questions.stream().filter(tq -> questionid.equals(tq.get("questionpid")))
+                            .collect(Collectors.toList());
+                    sonques.forEach(sq -> {
+                        sq.remove("mctype");
+                        sq.remove("mqtypename");
+                        sq.remove("mqstem");
+                        sq.remove("mqanalyze");
+                        sq.remove("mhashear");
+                        sq.remove("mhearfile");
+                        sq.remove("hashear");
+                        sq.remove("hearfile");
+                    });
+                    q.put("sonques", sonques);
+                } else {
+                    qmap = questions.stream().filter(tq -> questionid.equals(tq.get("questionid")))
+                            .findFirst().orElse(null);
+                    q.put("ctype", qmap.get("ctype"));
+                    q.put("score", qmap.get("score"));
+                    q.put("answer", qmap.get("answer"));
+                    q.put("qtypename", qmap.get("qtypename"));
+                    q.put("qstem", qmap.get("qstem"));
+                    q.put("qoption", qmap.get("qoption"));
+                    q.put("qanalyze", qmap.get("qanalyze"));
+                    q.put("hashear", qmap.get("hashear"));
+                    q.put("hearfile", qmap.get("hearfile"));
+                    q.put("qn", qmap.get("qn"));
+                    q.put("qorder", qmap.get("qorder"));
+                }
             }
             return list;
         } else {

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

@@ -68,9 +68,9 @@
     <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
-        from e_rclass_question erq left join e_paper_qtype_question epqq on erq.eptqid = epqq.eptqid
+        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 epq.epid = epa.epid
+        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
     </select>

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

@@ -11,15 +11,22 @@
     <!--试卷概况-题库-->
     <select id="listTkSjGk" resultType="java.util.Map">
         select erq.qn,erq.qorder,erq.classavgscore,erq.classsrate,erq.gradeavgscore,erq.gradesrate
-        ,erq.answerjson,erq.goodstujson,erq.badstujson
-        ,epqq.ctype,epqq.score,epqq.answer,epqq.qtypename,q.qstem,q.qoption,q.qanalyze
-        from e_rclass_question erq left join e_paper_qtype_question epqq on erq.eptqid = epqq.eptqid
-        left join t_question q on epqq.questionid = q.questionid
+        ,erq.answerjson,erq.goodstujson,erq.badstujson,erq.questionid,erq.eptqid
+        from e_rclass_question erq
         where erq.examid=#{rank.examid} and erq.classid=#{rank.classid}
         and erq.subjectid=#{rank.subjectid}
         <if test="rank.ranktype==1">order by erq.qorder</if>
         <if test="rank.ranktype==2">order by erq.classscore</if>
     </select>
+    <select id="listTkQuestion" resultType="java.util.Map">
+        select epqq.eptqid,epqq.ctype,epqq.score,epqq.answer,epqq.qtypename,epqq.questionid,epqq.qn,epqq.qorder
+        ,q.questionpid,q.qstem,q.qoption,q.qanalyze,q.hashear,q.hearfile
+        ,mq.questionid mquestionid,mq.qstem mqstem,mq.qanalyze mqanalyze,mq.ctype mctype
+        ,mq.qtypename mqtypename,mq.hashear mhashear,mq.hearfile mhearfile
+        from e_paper_qtype_question epqq left join t_question q on epqq.questionid = q.questionid
+        left join t_question mq on q.questionpid=mq.questionid
+        where epqq.epid=#{epid}
+    </select>
     <!--试卷概况-附件-->
     <select id="listFjSjGk" resultType="java.util.Map">
         select erq.qn,erq.qorder,erq.classavgscore,erq.classsrate,erq.gradeavgscore,erq.gradesrate