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

sexam/src/main/java/com/xhkjedu/sexam/controller/report/EReportClassController.java

@@ -63,9 +63,11 @@ public class EReportClassController {
         Integer examid = stu.getExamid();
         Integer page = stu.getPage();
         N_Utils.validation(new Object[]{examid, "考试id", 1, stu.getClassid(), "班级id", 1});
+        Integer showrank = eReportClassService.getShowRank(examid);
+        stu.setShowrank(showrank);
         if (N_Utils.isEmptyInteger(page)) {
             List<Map> list = eReportClassService.listCjd(stu);
-            return new ResultVo(0, "获取成功", ExamUtil.listCjdOrder(list));
+            return new ResultVo(0, "获取成功", ExamUtil.listCjdOrder(list, showrank));
         } else {
             List<Map> list = eReportClassService.listCjd(stu);
             PageResult pageResult = ExamUtil.getCjdPageResult(stu, list);

sexam/src/main/java/com/xhkjedu/sexam/controller/report/EReportSchoolController.java

@@ -65,9 +65,11 @@ public class EReportSchoolController {
         Integer examid = stu.getExamid();
         Integer page = stu.getPage();
         N_Utils.validation(new Object[]{examid, "考试id", 1});
+        Integer showrank = eReportSchoolService.getShowRank(examid);
+        stu.setShowrank(showrank);
         if (N_Utils.isEmptyInteger(page)) {
             List<Map> list = eReportSchoolService.listCjd(stu);
-            return new ResultVo(0, "获取成功", ExamUtil.listCjdOrder(list));
+            return new ResultVo(0, "获取成功", ExamUtil.listCjdOrder(list, showrank));
         } else {
             List<Map> list = eReportSchoolService.listCjd(stu);
             PageResult pageResult = ExamUtil.getCjdPageResult(stu, list);

sexam/src/main/java/com/xhkjedu/sexam/model/reportstu/ERstudent.java

@@ -91,4 +91,7 @@ public class ERstudent extends BaseBean {
     @Transient
     private Integer teacherid;//教师id
 
+    @Transient
+    private Integer showrank;//显示排名得分0保密1分数2分数+班排名3分数+班/校排名
+
 }

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

@@ -8,6 +8,7 @@ import com.xhkjedu.sexam.mapper.reportclass.ERclassMapper;
 import com.xhkjedu.sexam.mapper.reportclass.ERclassRankMapper;
 import com.xhkjedu.sexam.mapper.reportclass.EReportClassMapper;
 import com.xhkjedu.sexam.mapper.reportstu.ERstudentMapper;
+import com.xhkjedu.sexam.model.exam.EBase;
 import com.xhkjedu.sexam.model.reportstu.ERstudent;
 import com.xhkjedu.sexam.model.reportstu.ERstudentAction;
 import com.xhkjedu.sexam.utils.ExamUtil;
@@ -93,12 +94,18 @@ public class EReportClassService {
 
     //单科概况
     public Map getDkGk(ERankParamVo rank) {
+        EBase base = eBaseMapper.getShowRankById(rank.getExamid());
+        rank.setShowrank(base.getTeashowrank());
         Map map = eRclassMapper.findById(rank);//班级概况
         return map;
     }
 
     //单科概况-平均分
     public List<Map> listPjf(ERankParamVo rank) {
+        EBase base = eBaseMapper.getShowRankById(rank.getExamid());
+        Integer showrank = base.getTeashowrank();
+        if(showrank == 0) return new ArrayList<>();
+        rank.setShowrank(base.getTeashowrank());
         return eRclassMapper.listPjf(rank);
     }
 
@@ -161,6 +168,8 @@ public class EReportClassService {
     //试卷概况
     public Map listSjGk(ERankParamVo rank) {
         Map paper = eReportClassMapper.getPaperByExamSubjectId(rank);
+        EBase base = eBaseMapper.getShowRankById(rank.getExamid());
+        rank.setShowrank(base.getTeashowrank());
         Integer ptype = (Integer) paper.get("ptype");
         List<Map> list;
         if (ptype == 1) {
@@ -225,6 +234,8 @@ public class EReportClassService {
     //试卷分析
     public Map getSjFx(ERankParamVo rank) {
         Map map = new HashMap();
+        EBase base = eBaseMapper.getShowRankById(rank.getExamid());
+        rank.setShowrank(base.getTeashowrank());
         List<Map> types = eReportClassMapper.listType(rank);//大题分析
         List<Map> questions = eReportClassMapper.listQuestion(rank);//小题分析
         List<Map> points = eReportClassMapper.listPoint(rank);//知识点分析
@@ -370,4 +381,10 @@ public class EReportClassService {
     public List<Map> listEndExamsForClass(ReportParamsVo paramsVo) {
         return eReportClassMapper.listEndExamsForClass(paramsVo);
     }
+
+    //获取教师显示排名得分
+    public Integer getShowRank(Integer examid) {
+        EBase base = eBaseMapper.getShowRankById(examid);
+        return base.getTeashowrank();
+    }
 }

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

@@ -204,4 +204,10 @@ public class EReportSchoolService {
         map.put("classes",classes);
         return map;
     }
+
+    //获取教师显示排名得分
+    public Integer getShowRank(Integer examid) {
+        EBase base = eBaseMapper.getShowRankById(examid);
+        return base.getTeashowrank();
+    }
 }

sexam/src/main/java/com/xhkjedu/sexam/utils/ExamUtil.java

@@ -319,9 +319,26 @@ public class ExamUtil {
         }
         List<ERstudent> studentList = students.stream().skip(start).limit(pageSize).collect(Collectors.toList());
         List<Map> rstudentList = new ArrayList<>();
+        Integer showrank = stu.getShowrank();
         for (ERstudent map : studentList) {
             Integer studentid = map.getStudentid();
             Map rs = list.stream().filter(s2 -> s2.get("studentid").equals(studentid)).findFirst().orElse(null);
+            if (showrank != 3) {
+                List<Map> subjects = (List<Map>) rs.get("subjects");
+                for (Map s : subjects) {
+                    if (showrank == 2) {
+                        s.put("schoolrank", "0");
+                        s.put("goal", "0");
+                        s.put("nextgoal", "0");
+                    } else {
+                        s.put("classrank", "0");
+                        s.put("classrankpre", "0");
+                        s.put("schoolrank", "0");
+                        s.put("goal", "0");
+                        s.put("nextgoal", "0");
+                    }
+                }
+            }
             rstudentList.add(rs);
         }
         pageResult.setList(rstudentList);
@@ -335,7 +352,7 @@ public class ExamUtil {
      * @Date 2022/10/23 11:49
      * @return java.util.List<java.util.Map>
      **/
-    public static List<Map> listCjdOrder(List<Map> list) {
+    public static List<Map> listCjdOrder(List<Map> list, Integer showrank) {
         List<ERstudent> students = new ArrayList<>();
         for (Map s : list) {
             Integer studentid = (Integer) s.get("studentid");
@@ -355,6 +372,22 @@ public class ExamUtil {
         for (ERstudent map : students) {
             Integer studentid = map.getStudentid();
             Map rs = list.stream().filter(s2 -> s2.get("studentid").equals(studentid)).findFirst().orElse(null);
+            if (showrank != 3) {
+                List<Map> subjects = (List<Map>) rs.get("subjects");
+                for (Map s : subjects) {
+                    if (showrank == 2) {
+                        s.put("schoolrank", "0");
+                        s.put("goal", "0");
+                        s.put("nextgoal", "0");
+                    } else {
+                        s.put("classrank", "0");
+                        s.put("classrankpre", "0");
+                        s.put("schoolrank", "0");
+                        s.put("goal", "0");
+                        s.put("nextgoal", "0");
+                    }
+                }
+            }
             rstudentList.add(rs);
         }
         return rstudentList;

sexam/src/main/java/com/xhkjedu/sexam/vo/report/ERankParamVo.java

@@ -32,4 +32,6 @@ public class ERankParamVo {
     private Integer ranktype;
 
     private List<ERrank> rranks;//等级
+
+    private Integer showrank;//显示排名得分0保密1分数2分数+班排名3分数+班/校排名
 }

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

@@ -32,8 +32,19 @@
     </select>
     <!--班级报告-单科概况-班级概况-->
     <select id="findById" resultType="java.util.Map">
-        select er.classmaxscore,er.classavgscore,er.classavgscorerank,er.schoolmaxscore,er.schoolavgscore
-        ,er.yxrate,er.jgrate
+        select er.yxrate,er.jgrate
+        <if test="rank.showrank==0">
+            ,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
+        </if>
+        <if test="rank.showrank==2">
+            ,er.classmaxscore,er.classavgscore,er.classavgscorerank,0 schoolmaxscore,0 schoolavgscore
+        </if>
+        <if test="rank.showrank==3">
+            ,er.classmaxscore,er.classavgscore,er.classavgscorerank,er.schoolmaxscore,er.schoolavgscore
+        </if>
         from e_rclass er
         where er.examid=#{rank.examid} and er.classid=#{rank.classid} and er.subjectid=#{rank.subjectid}
         limit 1

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

@@ -10,8 +10,14 @@
     </select>
     <!--试卷概况-题库-->
     <select id="listTkSjGk" resultType="java.util.Map">
-        select erq.qn,erq.qorder,erq.classavgscore,erq.classsrate,erq.gradeavgscore,erq.gradesrate,erq.classratetype
+        select erq.qn,erq.qorder,erq.classratetype
         ,erq.answerjson,erq.fullscorenum,erq.goodstujson,erq.badstujson,erq.questionid,erq.eptqid,erq.complexity,erq.score
+        <if test="rank.showrank==0">
+            ,0 classavgscore,0 classsrate,0 gradeavgscore,0 gradesrate
+        </if>
+        <if test="rank.showrank!=0">
+            ,erq.classavgscore,erq.classsrate,erq.gradeavgscore,erq.gradesrate
+        </if>
         from e_rclass_question erq
         where erq.examid=#{rank.examid} and erq.classid=#{rank.classid}
         and erq.subjectid=#{rank.subjectid}
@@ -29,9 +35,15 @@
     </select>
     <!--试卷概况-附件-->
     <select id="listFjSjGk" resultType="java.util.Map">
-        select erq.qn,erq.qorder,erq.classavgscore,erq.classsrate,erq.gradeavgscore,erq.gradesrate
+        select erq.qn,erq.qorder
         ,erq.answerjson,erq.fullscorenum,erq.goodstujson,erq.badstujson,erq.eptqid,erq.classratetype
         ,epqq.ctype,epqq.score,epqq.answer,epqq.qtypename,epqq.optionnum
+        <if test="rank.showrank==0">
+            ,0 classavgscore,0 classsrate,0 gradeavgscore,0 gradesrate
+        </if>
+        <if test="rank.showrank!=0">
+            ,erq.classavgscore,erq.classsrate,erq.gradeavgscore,erq.gradesrate
+        </if>
         from e_rclass_question erq left join e_paper_qtype_question epqq on erq.eptqid = epqq.eptqid
         where erq.examid=#{rank.examid} and erq.classid=#{rank.classid}
         and erq.subjectid=#{rank.subjectid}
@@ -40,7 +52,13 @@
     </select>
     <!--试卷分析-大题分析-->
     <select id="listType" resultType="java.util.Map">
-        select erq.qtypename,erq.qns,erq.score,erq.srate,erq.classavgscore,erq.classsrate,erq.gradeavgscore,erq.gradesrate
+        select erq.qtypename,erq.qns,erq.score,erq.srate
+        <if test="rank.showrank==0">
+            ,0 classavgscore,0 classsrate,0 gradeavgscore,0 gradesrate
+        </if>
+        <if test="rank.showrank!=0">
+            ,erq.classavgscore,erq.classsrate,erq.gradeavgscore,erq.gradesrate
+        </if>
         from e_rclass_qtype erq
         where erq.examid=#{rank.examid} and erq.classid=#{rank.classid}
         and erq.subjectid=#{rank.subjectid}
@@ -48,7 +66,12 @@
     <!--试卷分析-小题分析-->
     <select id="listQuestion" resultType="java.util.Map">
         select erq.eptqid,erq.qn,erq.qorder,erq.score,erq.qtypename,erq.complexity
-        ,erq.classavgscore,erq.classsrate,erq.gradeavgscore,erq.gradesrate
+        <if test="rank.showrank==0">
+            ,0 classavgscore,0 classsrate,0 gradeavgscore,0 gradesrate
+        </if>
+        <if test="rank.showrank!=0">
+            ,erq.classavgscore,erq.classsrate,erq.gradeavgscore,erq.gradesrate
+        </if>
         ,erq.answerjson,erq.fullscorenum
         from e_rclass_question erq
         where erq.examid=#{rank.examid} and erq.classid=#{rank.classid}
@@ -56,7 +79,13 @@
     </select>
     <!--试卷分析-知识点分析-->
     <select id="listPoint" resultType="java.util.Map">
-        select erp.pointname,erp.qns,erp.score,erp.srate,erp.classavgscore,erp.classsrate,erp.gradeavgscore,erp.gradesrate
+        select erp.pointname,erp.qns,erp.score,erp.srate
+        <if test="rank.showrank==0">
+            ,0 classavgscore,0 classsrate,0 gradeavgscore,0 gradesrate
+        </if>
+        <if test="rank.showrank!=0">
+            ,erp.classavgscore,erp.classsrate,erp.gradeavgscore,erp.gradesrate
+        </if>
         from e_rclass_point erp
         where erp.examid=#{rank.examid} and erp.classid=#{rank.classid}
         and erp.subjectid=#{rank.subjectid}

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

@@ -9,8 +9,8 @@
         </collection>
     </resultMap>
     <select id="listSubject" resultType="java.util.Map">
-        select s.score,s.classrank,s.classrankpre,s.classmaxscore,s.classavgscore
-        ,s.schoolrank,s.schoolmaxscore,s.schoolavgscore,s.goal,s.nextgoal,s.subjectname,s.subjectid,s.bzscore
+        select s.score,s.classrank,s.classrankpre
+        ,s.schoolrank,s.goal,s.nextgoal,s.subjectname,s.subjectid,s.bzscore
         ,eps.device,eps.submittype,eps.endtime
         ,(case when s.subjectid='zf' then (select (
         case when count(eps2.epsid)=count(case when eps2.sstate=3 then eps2.epsid else null end) then 3 else 2 end)
@@ -362,8 +362,16 @@
     <!--班级报告教师成绩单-->
     <select id="listTeacherCjd" resultType="java.util.Map">
         select cs.examid,cs.classid,cs.studentid,u.username,u.loginname,u.usersex,u.examno
-        ,s.score,s.classrank,s.classrankpre,s.classmaxscore,s.classavgscore
-        ,s.schoolrank,s.schoolmaxscore,s.schoolavgscore,s.goal,s.nextgoal,s.subjectname,s.subjectid,s.bzscore
+        ,s.score,s.subjectname,s.subjectid
+        <if test="stu.showrank==0 or stu.showrank==1">
+            ,0 classrank,0 schoolrank
+        </if>
+        <if test="stu.showrank==2">
+            ,s.classrank,0 schoolrank
+        </if>
+        <if test="stu.showrank==3">
+            ,s.classrank,s.schoolrank
+        </if>
         ,eps.device,eps.submittype,eps.endtime
         from e_class_student cs left join t_user u on cs.studentid=u.userid
         left join e_rstudent s on cs.classid = s.classid and cs.examid=s.examid and cs.studentid=s.studentid