班级报告、单科报告 分数排名显示控制

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

@@ -105,12 +105,14 @@ public class EReportClassService {
         EBase base = eBaseMapper.getShowRankById(rank.getExamid());
         Integer showrank = base.getTeashowrank();
         if(showrank == 0) return new ArrayList<>();
-        rank.setShowrank(base.getTeashowrank());
+        rank.setShowrank(showrank);
         return eRclassMapper.listPjf(rank);
     }
 
     //单科概况-高频错题
     public List<Map> listGpCt(ERankParamVo rank) {
+        EBase base = eBaseMapper.getShowRankById(rank.getExamid());
+        rank.setShowrank(base.getTeashowrank());
         List<Map> gpctList = eRclassMapper.listGpCt(rank);
         for (Map ct : gpctList) {
             //知识点
@@ -162,6 +164,10 @@ public class EReportClassService {
 
     //单科概况-需关注学生
     public List<Map> listGzXs(ERankParamVo rank) {
+        EBase base = eBaseMapper.getShowRankById(rank.getExamid());
+        Integer showrank = base.getTeashowrank();
+        if (showrank == 0) return new ArrayList<>();
+        rank.setShowrank(showrank);
         return eRclassMapper.listGzXs(rank);
     }
 
@@ -336,6 +342,9 @@ public class EReportClassService {
 
     //单科概况-等级统计
     public List<Map> listDkGkDjTj(ERankParamVo rank) {
+        EBase base = eBaseMapper.getShowRankById(rank.getExamid());
+        Integer showrank = base.getTeashowrank();
+        if (showrank != 3) return new ArrayList<>();
         return eRclassRankMapper.listDkGkDjTj(rank);
     }
 

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

@@ -37,12 +37,9 @@
             ,0 classmaxscore,0 classavgscore,0 classavgscorerank,0 schoolmaxscore,0 schoolavgscore
         </if>
         <if test="rank.showrank==1">
-            ,er.classmaxscore,er.classavgscore,0 classavgscorerank,0 schoolmaxscore,0 schoolavgscore
+            ,er.classmaxscore,er.classavgscore,0 classavgscorerank,er.schoolmaxscore,er.schoolavgscore
         </if>
-        <if test="rank.showrank==2">
-            ,er.classmaxscore,er.classavgscore,er.classavgscorerank,0 schoolmaxscore,0 schoolavgscore
-        </if>
-        <if test="rank.showrank==3">
+        <if test="rank.showrank==2 or rank.showrank==3">
             ,er.classmaxscore,er.classavgscore,er.classavgscorerank,er.schoolmaxscore,er.schoolavgscore
         </if>
         from e_rclass er
@@ -66,7 +63,13 @@
     </select>
     <!--班级报告-单科概况-需关注学生-->
     <select id="listGzXs" resultType="java.util.Map">
-        select u.username,er.score,er.classrank,er.classrankpre,er.goal
+        select u.username
+        <if test="rank.showrank==1">
+            ,er.score,0 classrank,0 classrankpre
+        </if>
+        <if test="rank.showrank!=1">
+            ,er.score,er.classrank,er.classrankpre
+        </if>
         <if test="rank.ranktype==3">,es.score*0.6 hgscore</if>
         from e_rstudent er left join t_user u on er.studentid=u.userid
         <if test="rank.ranktype==3">
@@ -88,8 +91,14 @@
     </select>
     <!--班级报告-单科概况-高频错题-->
     <select id="listGpCt" resultType="java.util.Map">
-        select erq.eptqid,erq.qn,erq.classsrate,erq.gradesrate,erq.answerjson,erq.erroroption
+        select erq.eptqid,erq.qn,erq.answerjson,erq.erroroption
         ,epq.eptname,epqq.answer,epqq.ctype,epa.pointjson
+        <if test="rank.showrank==0">
+            ,0 classsrate,0 gradesrate
+        </if>
+        <if test="rank.showrank!=0">
+            ,erq.classsrate,erq.gradesrate
+        </if>
         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