学生报告错题集分数显示控制

sexam/src/main/java/com/xhkjedu/sexam/mapper/reportstu/ERstudentMapper.java

@@ -45,12 +45,13 @@ public interface ERstudentMapper extends TkMapper<ERstudent> {
     List<Map> listStudentQuestionsFj(@Param("epid") Integer epid, @Param("studentid") Integer studentid
             ,@Param("showrank") Integer showrank);
     //学生报告-错题集-各科目错题
-    List<Map> listStudentSubjectErrorQues(@Param("examid") Integer examid, @Param("studentid") Integer studentid
-            ,@Param("showrank") Integer showrank);
+    List<Map> listStudentSubjectErrorQues(@Param("examid") Integer examid, @Param("studentid") Integer studentid);
     //学生报告-错题集-学生科目下错题
-    List<Map> listStudentErrorQuestionsForTk(@Param("examid")Integer examid,@Param("studentid")Integer studentid,@Param("subjectid")String subjectid);
+    List<Map> listStudentErrorQuestionsForTk(@Param("examid") Integer examid, @Param("studentid") Integer studentid
+            , @Param("subjectid") String subjectid,@Param("showrank") Integer showrank);
     //学生报告-错题集-学生科目下错题（附件）
-    List<Map> listStudentErrorQuestionsForFj(@Param("examid")Integer examid,@Param("studentid")Integer studentid,@Param("subjectid")String subjectid);
+    List<Map> listStudentErrorQuestionsForFj(@Param("examid") Integer examid, @Param("studentid") Integer studentid
+            , @Param("subjectid") String subjectid,@Param("showrank") Integer showrank);
     //学生报告-监控照片-考试科目下违规图片数量
     List<Map> listExamSubjectBadNums(@Param("examid")Integer examid,@Param("studentid")Integer studentid);
     //学生报告-监控照片-学生单科图片

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

@@ -431,15 +431,7 @@ public class EReportStudentService {
      * @Date 2022/8/29 11:39
      **/
     public List<Map> listStudentSubjectErrorQues(Integer examid, Integer studentid, Integer teacherid) {
-        Integer showrank;
-        EBase base = eBaseMapper.getShowRankById(examid);
-        if (!N_Utils.isEmptyInteger(teacherid)) {
-            showrank = base.getTeashowrank();
-        } else {
-            showrank = base.getStushowrank();
-        }
-        List<Map> list = eRstudentMapper.listStudentSubjectErrorQues(examid, studentid, showrank);
-        if (showrank == 0) return list;
+        List<Map> list = eRstudentMapper.listStudentSubjectErrorQues(examid, studentid);
         for (Map map : list) {
             List<Map> queslist = (List<Map>) map.get("questions");
             Integer ptype = Integer.parseInt(map.get("ptype").toString());
@@ -481,13 +473,7 @@ public class EReportStudentService {
         } else {
             showrank = base.getStushowrank();
         }
-        if (showrank == 0) {
-            Map map = new HashMap();
-            map.put("questions", new ArrayList<>());
-            map.put("points", new ArrayList<>());
-            return map;
-        }
-        List<Map> list = eRstudentMapper.listStudentErrorQuestionsForTk(examid, studentid, subjectid);
+        List<Map> list = eRstudentMapper.listStudentErrorQuestionsForTk(examid, studentid, subjectid, showrank);
         Map panalyze = ePaperAnalyzeMapper.getPaperAnalzyeBySubjectid(examid, subjectid);
         String pointjson = panalyze.get("pointjson").toString();
         List<Map> pointlist = JSON.parseArray(pointjson, Map.class);
@@ -536,8 +522,8 @@ public class EReportStudentService {
         } else {
             showrank = base.getStushowrank();
         }
-        if (showrank == 0) return new ArrayList<>();
-        List<Map> list = eRstudentMapper.listStudentErrorQuestionsForFj(examid, studentid, subjectid);
+        List<Map> list = eRstudentMapper.listStudentErrorQuestionsForFj(examid, studentid, subjectid, showrank);
+        if(showrank == 0) return list;
         for (Map map : list) {
             Double stuscore = Double.parseDouble(map.get("stuscore").toString());
             Double pscore = Double.parseDouble(map.get("qscore").toString());

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

@@ -306,7 +306,6 @@
         </collection>
     </resultMap>
     <select id="listStudentSubjectErrorQues" resultMap="listStudentSubjectErrorQues">
-        <if test="showrank!=0">
         select sq.subjectid,st.subjectname,p.ptype,sq.epsqid,sq.eptqid,q.questionid,q.qlevel,q.questionpid
         from e_paper_student_question sq
         left join t_question q on q.questionid=sq.questionid
@@ -314,20 +313,20 @@
         left join e_paper p on sq.epid=p.epid
         left join e_subject st on p.esid=st.esid
         where sq.examid=#{examid} and sq.studentid=#{studentid} and st.pstate=2 and sq.stuscore &lt; sq.qscore group by sq.epsqid order by st.esid
-        </if>
-        <if test="showrank==0">
-        select st.subjectid,st.subjectname,p.ptype,0 num
-        from e_subject st left join e_paper p on st.esid=p.esid
-        where st.examid=#{examid} and st.pstate=2
-        </if>
     </select>
     <!--学生报告-错题集-学生科目下错题（题库）-->
     <select id="listStudentErrorQuestionsForTk" resultMap="listStudentQues">
-        select sq.epsqid,sq.eptqid,sq.ctype,sq.questionid,sq.qn,sq.qorder,sq.qscore,sq.stuscore,sq.answered,
+        select sq.epsqid,sq.eptqid,sq.ctype,sq.questionid,sq.qn,sq.qorder,sq.qscore,sq.answered,
                sq.answertype,sq.stuanswer,sq.stuanswertxt,pq.answer,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.hashear,q.hearfile,
                q.qlevel,q.sorder,q.complexity,q.questionpid,mq.questionid mquestionid,mq.qstem mqstem,mq.qoption mqoption,mq.qanswer mqanswer,
                mq.qanalyze mqanalyze,mq.hashear mhashear,mq.hearfile mhearfile,mq.qlevel mqlevel,mq.ctype mctype,mq.snum msnum,
-               mq.complexity mcomplexity,cq.classavgscore,cq.gradeavgscore
+               mq.complexity mcomplexity
+        <if test="showrank==0">
+            ,0 stuscore,0 classavgscore,0 gradeavgscore
+        </if>
+        <if test="showrank!=0">
+            ,sq.stuscore,cq.classavgscore,cq.gradeavgscore
+        </if>
         from e_paper_student_question sq left join t_question q on sq.questionid=q.questionid
         left join t_question mq on q.questionpid=mq.questionid
         left join e_rclass_question cq on sq.epid=cq.epid and sq.classid=cq.classid and (sq.questionid=cq.questionid or mq.questionid=cq.questionid)
@@ -338,9 +337,14 @@
 
     <!--学生报告-错题集-学生科目下错题（附件）-->
     <select id="listStudentErrorQuestionsForFj" resultType="java.util.Map">
-        select sq.epsqid,sq.eptqid,sq.ctype,sq.qn,sq.qorder,sq.qscore,sq.stuscore,sq.answered,
-               sq.answertype,sq.stuanswer,sq.stuanswertxt,q.qtypeid,q.qtypename,q.optionnum,q.answer,
-               cq.classavgscore,cq.gradeavgscore
+        select sq.epsqid,sq.eptqid,sq.ctype,sq.qn,sq.qorder,sq.qscore,sq.answered,
+               sq.answertype,sq.stuanswer,sq.stuanswertxt,q.qtypeid,q.qtypename,q.optionnum,q.answer
+        <if test="showrank==0">
+            ,0 stuscore,0 classavgscore,0 gradeavgscore
+        </if>
+        <if test="showrank!=0">
+            ,sq.stuscore,cq.classavgscore,cq.gradeavgscore
+        </if>
         from e_paper_student_question sq left join e_rclass_question cq on sq.eptqid=cq.eptqid and sq.classid=cq.classid
         left join e_paper_qtype_question q on sq.eptqid=q.eptqid
         where sq.examid=#{examid} and sq.subjectid=#{subjectid} and sq.studentid=#{studentid} and sq.stuscore &lt; sq.qscore