显示排名得分

sexam/src/main/java/com/xhkjedu/sexam/mapper/exam/EBaseMapper.java

@@ -62,5 +62,5 @@ public interface EBaseMapper extends TkMapper<EBase> {
     EBaseVo getExamStateAndMode(@Param("examid") Integer examid);
 
     //根据考试id获取显示排名
-    Integer getShowRankById(@Param("examid") Integer examid);
+    EBase getShowRankById(@Param("examid") Integer examid);
 }

sexam/src/main/java/com/xhkjedu/sexam/model/exam/EBase.java

@@ -36,8 +36,11 @@ public class EBase extends BaseBean {
     //考试状态0未开始1已开始2已结束3已生成报告
     private Integer examstate;
 
-    //显示排名得分0保密1分数2分数+班排名3分数+校排名
-    private Integer showrank;
+    //教师显示排名得分0保密1分数2分数+班排名3分数+校排名
+    private Integer teashowrank;
+
+    //学生显示排名得分0保密1分数2分数+班排名3分数+校排名
+    private Integer stushowrank;
 
     //考试公告
     private String examcomm;

sexam/src/main/java/com/xhkjedu/sexam/service/exam/EBaseService.java

@@ -67,7 +67,8 @@ public class EBaseService {
         try {
             //考试
             model.setExamstate(0);
-            model.setShowrank(0);
+            model.setTeashowrank(0);
+            model.setStushowrank(0);
             model.setDeleted(1);
             model.setReportstate(0);
             model.setCreatetime(N_Utils.getSecondTimestamp());
@@ -511,7 +512,8 @@ public class EBaseService {
 
     //设置学生报告排名显示
     public void setShowRank(EBase eBase) {
-        if (eBase.getShowrank() == null) eBase.setShowrank(0);
+        if (eBase.getTeashowrank() == null) eBase.setTeashowrank(0);
+        if (eBase.getStushowrank() == null) eBase.setStushowrank(0);
         eBaseMapper.updateByPrimaryKeySelective(eBase);
     }
 }

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

@@ -8,6 +8,7 @@ import com.xhkjedu.sexam.mapper.paper.EPaperAnalyzeMapper;
 import com.xhkjedu.sexam.mapper.paper.EPaperFileMapper;
 import com.xhkjedu.sexam.mapper.paper.EPaperMapper;
 import com.xhkjedu.sexam.mapper.reportstu.ERstudentMapper;
+import com.xhkjedu.sexam.model.exam.EBase;
 import com.xhkjedu.sexam.utils.ExamUtil;
 import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
@@ -73,10 +74,11 @@ public class EReportStudentService {
      **/
     public Map listStudentSubjectScoreByExamid(Integer examid, Integer studentid, Integer teacherid) {
         Integer showrank;
+        EBase base = eBaseMapper.getShowRankById(examid);
         if (!N_Utils.isEmptyInteger(teacherid)) {
-            showrank = 1;
+            showrank = base.getTeashowrank();
         } else {
-            showrank = eBaseMapper.getShowRankById(examid);
+            showrank = base.getStushowrank();
         }
         List<Map> list = eRstudentMapper.getStudentScoreByExamid(examid, studentid, showrank);
         Map rtnmap = new LinkedHashMap();
@@ -84,7 +86,7 @@ public class EReportStudentService {
         if (list != null && list.size() > 0) {
             String classnum = "0";
             String gradenum = "0";
-            if (showrank == 1) {
+            if (showrank != 0) {
                 Map map1 = list.get(0);
                 Integer classid = Integer.parseInt(map1.get("classid").toString());
                 Map gcnum = eRstudentMapper.getStudentNumByExamid(examid, classid);
@@ -107,12 +109,13 @@ public class EReportStudentService {
      **/
     public List<Map> listStudentRankHistory(Integer studentid, Integer examid, Integer teacherid) {
         Integer showrank;
+        EBase base = eBaseMapper.getShowRankById(examid);
         if (!N_Utils.isEmptyInteger(teacherid)) {
-            showrank = 1;
+            showrank = base.getTeashowrank();
         } else if (N_Utils.isEmptyInteger(examid)) {
             showrank = 0;
         } else {
-            showrank = eBaseMapper.getShowRankById(examid);
+            showrank = base.getStushowrank();
         }
         if (showrank == 0) return new ArrayList<>();
         return eRstudentMapper.listStudentExamHistory(studentid, "zf");
@@ -127,10 +130,11 @@ public class EReportStudentService {
      **/
     public Map getSubjectScoreByStudentid(Integer examid, Integer studentid, String subjectid, Integer teacherid) {
         Integer showrank;
+        EBase base = eBaseMapper.getShowRankById(examid);
         if (!N_Utils.isEmptyInteger(teacherid)) {
-            showrank = 1;
+            showrank = base.getTeashowrank();
         } else {
-            showrank = eBaseMapper.getShowRankById(examid);
+            showrank = base.getStushowrank();
         }
         Map rtnmap = eRstudentMapper.getSubjectScoreByStudentid(examid, studentid, subjectid, showrank);
         if (rtnmap != null && rtnmap.size() > 0) {
@@ -164,10 +168,11 @@ public class EReportStudentService {
      **/
     public List<Map> listSubjectPoints(Integer examid, Integer studentid, String subjectid, Integer teacherid) {
         Integer showrank;
+        EBase base = eBaseMapper.getShowRankById(examid);
         if (!N_Utils.isEmptyInteger(teacherid)) {
-            showrank = 1;
+            showrank = base.getTeashowrank();
         } else {
-            showrank = eBaseMapper.getShowRankById(examid);
+            showrank = base.getStushowrank();
         }
         return eRstudentMapper.listSubjectPoints(examid, studentid, subjectid, showrank);
     }
@@ -181,10 +186,11 @@ public class EReportStudentService {
      **/
     public List<Map> listSubjectComplexitys(Integer examid, Integer studentid, String subjectid, Integer teacherid) {
         Integer showrank;
+        EBase base = eBaseMapper.getShowRankById(examid);
         if (!N_Utils.isEmptyInteger(teacherid)) {
-            showrank = 1;
+            showrank = base.getTeashowrank();
         } else {
-            showrank = eBaseMapper.getShowRankById(examid);
+            showrank = base.getStushowrank();
         }
         return eRstudentMapper.listSubjectComplexitys(examid, studentid, subjectid, showrank);
     }
@@ -198,10 +204,11 @@ public class EReportStudentService {
      **/
     public List<Map> listSubjectQtypes(Integer examid, Integer studentid, String subjectid, Integer teacherid) {
         Integer showrank;
+        EBase base = eBaseMapper.getShowRankById(examid);
         if (!N_Utils.isEmptyInteger(teacherid)) {
-            showrank = 1;
+            showrank = base.getTeashowrank();
         } else {
-            showrank = eBaseMapper.getShowRankById(examid);
+            showrank = base.getStushowrank();
         }
         return eRstudentMapper.listSubjectQtypes(examid, studentid, subjectid, showrank);
     }
@@ -215,10 +222,11 @@ public class EReportStudentService {
      **/
     public List<Map> listSubjectQuestions(Integer examid, Integer studentid, String subjectid, Integer teacherid) {
         Integer showrank;
+        EBase base = eBaseMapper.getShowRankById(examid);
         if (!N_Utils.isEmptyInteger(teacherid)) {
-            showrank = 1;
+            showrank = base.getTeashowrank();
         } else {
-            showrank = eBaseMapper.getShowRankById(examid);
+            showrank = base.getStushowrank();
         }
         Map map = ePaperMapper.getPaperByExamidAndSubjectid(examid, subjectid);
         Integer ptype = Integer.parseInt(map.get("ptype").toString());
@@ -276,10 +284,11 @@ public class EReportStudentService {
     public Map getStudentPaperQuestions(Integer examid, Integer studentid, String subjectid, Integer teacherid) {
         Integer showrank;
         Integer pstate = eSubjectMapper.getPstateByExamIdSid(examid, subjectid);
+        EBase base = eBaseMapper.getShowRankById(examid);
         if (!N_Utils.isEmptyInteger(teacherid)) {
-            showrank = 1;
+            showrank = base.getTeashowrank();
         } else {
-            showrank = eBaseMapper.getShowRankById(examid);
+            showrank = base.getStushowrank();
         }
         Map map = ePaperMapper.getPaperByExamidAndSubjectid(examid, subjectid);
         Integer ptype = Integer.parseInt(map.get("ptype").toString());
@@ -423,10 +432,11 @@ public class EReportStudentService {
      **/
     public List<Map> listStudentSubjectErrorQues(Integer examid, Integer studentid, Integer teacherid) {
         Integer showrank;
+        EBase base = eBaseMapper.getShowRankById(examid);
         if (!N_Utils.isEmptyInteger(teacherid)) {
-            showrank = 1;
+            showrank = base.getTeashowrank();
         } else {
-            showrank = eBaseMapper.getShowRankById(examid);
+            showrank = base.getStushowrank();
         }
         List<Map> list = eRstudentMapper.listStudentSubjectErrorQues(examid, studentid, showrank);
         if (showrank == 0) return list;
@@ -465,10 +475,11 @@ public class EReportStudentService {
     public Map listStudentErrorQuestionsTk(Integer examid, Integer studentid, String subjectid, Integer teacherid) {
         Integer pstate = eSubjectMapper.getPstateByExamIdSid(examid, subjectid);
         Integer showrank;
+        EBase base = eBaseMapper.getShowRankById(examid);
         if (!N_Utils.isEmptyInteger(teacherid)) {
-            showrank = 1;
+            showrank = base.getTeashowrank();
         } else {
-            showrank = eBaseMapper.getShowRankById(examid);
+            showrank = base.getStushowrank();
         }
         if (showrank == 0) {
             Map map = new HashMap();
@@ -519,10 +530,11 @@ public class EReportStudentService {
      **/
     public List<Map> listStudentErrorQuestionsFj(Integer examid, Integer studentid, String subjectid, Integer teacherid) {
         Integer showrank;
+        EBase base = eBaseMapper.getShowRankById(examid);
         if (!N_Utils.isEmptyInteger(teacherid)) {
-            showrank = 1;
+            showrank = base.getTeashowrank();
         } else {
-            showrank = eBaseMapper.getShowRankById(examid);
+            showrank = base.getStushowrank();
         }
         if (showrank == 0) return new ArrayList<>();
         List<Map> list = eRstudentMapper.listStudentErrorQuestionsForFj(examid, studentid, subjectid);

sexam/src/main/resources/mapper/exam/EBaseMapper.xml

@@ -12,7 +12,7 @@
     </delete>
     <!--考试列表-->
     <select id="listAll" resultType="java.util.Map">
-        select b.examid,b.examname,b.examdate,b.gradeid,b.examtype,b.exammode,b.monitored,b.showrank
+        select b.examid,b.examname,b.examdate,b.gradeid,b.examtype,b.exammode,b.monitored,b.teashowrank,b.stushowrank
         ,b.examstate,u.username createname,group_concat(distinct es.subjectname order by es.esid separator '|')subjectname
         ,count(distinct case when es.begintime is null or es.begintime='' then es.esid else null end)esnum
         ,min(es.esstate)esstate,min(es.pstate)pstate,min(ifnull(ep.correcttype,0))correcttype
@@ -62,12 +62,13 @@
     </update>
     <!--考试基本信息-->
     <select id="findById" resultType="java.util.Map">
-        select examid,examname,gradeid,examdate,examtype,exammode,monitored,examstate,showrank
+        select examid,examname,gradeid,examdate,examtype,exammode,monitored,examstate,teashowrank,stushowrank
         from e_base where examid=#{examid}
     </select>
     <!--考试基本信息(带考试人数)-->
     <select id="findById2" resultType="java.util.Map">
-        select b.examid,b.examname,b.examdate,b.examtype,b.gradeid,b.exammode,b.monitored,b.examstate,b.examcomm,showrank
+        select b.examid,b.examname,b.examdate,b.examtype,b.gradeid,b.exammode,b.monitored,b.examstate,b.examcomm
+        ,teashowrank,stushowrank
         ,(select sum(c.classnum) from e_class c where c.examid=b.examid)examnum
         from e_base b where b.examid=#{examid}
     </select>
@@ -124,8 +125,8 @@
         from e_base eb where eb.examid=#{examid}
     </select>
     <!--根据考试id获取显示排名-->
-    <select id="getShowRankById" resultType="java.lang.Integer">
-        select eb.showrank
+    <select id="getShowRankById" resultType="com.xhkjedu.sexam.model.exam.EBase">
+        select eb.teashowrank,eb.stushowrank
         from e_base eb where eb.examid=#{examid}
     </select>
 </mapper>

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

@@ -45,7 +45,15 @@
              ,0 schoolmaxscore,0 schoolavgscore,0 goal,0 nextgoal
         </if>
         <if test="showrank==1">
-            ,rs.score,rs.bzscore,rs.classrank,rs.classrankpre,rs.classmaxscore,rs.classavgscore,rs.schoolrank
+            ,rs.score,rs.bzscore,0 classrank,0 classrankpre,rs.classmaxscore,rs.classavgscore,0 schoolrank
+            ,rs.schoolmaxscore,rs.schoolavgscore,0 goal,0 nextgoal
+        </if>
+        <if test="showrank==2">
+            ,rs.score,rs.bzscore,rs.classrank,rs.classrankpre,rs.classmaxscore,rs.classavgscore,0 schoolrank
+            ,rs.schoolmaxscore,rs.schoolavgscore,0 goal,0 nextgoal
+        </if>
+        <if test="showrank==3">
+            ,rs.score,rs.bzscore,0 classrank,0 classrankpre,rs.classmaxscore,rs.classavgscore,rs.schoolrank
             ,rs.schoolmaxscore,rs.schoolavgscore,rs.goal,rs.nextgoal
         </if>
         ,eps.device,eps.submittype,eps.endtime
@@ -81,7 +89,15 @@
             ,0 schoolmaxscore,0 schoolavgscore,0 goal,0 nextgoal
         </if>
         <if test="showrank==1">
-            ,rs.score,rs.bzscore,rs.classrank,rs.classrankpre,rs.classmaxscore,rs.classavgscore,rs.schoolrank
+            ,rs.score,rs.bzscore,0 classrank,0 classrankpre,rs.classmaxscore,rs.classavgscore,0 schoolrank
+            ,rs.schoolmaxscore,rs.schoolavgscore,0 goal,0 nextgoal
+        </if>
+        <if test="showrank==2">
+            ,rs.score,rs.bzscore,rs.classrank,rs.classrankpre,rs.classmaxscore,rs.classavgscore,0 schoolrank
+            ,rs.schoolmaxscore,rs.schoolavgscore,0 goal,0 nextgoal
+        </if>
+        <if test="showrank==3">
+            ,rs.score,rs.bzscore,0 classrank,0 classrankpre,rs.classmaxscore,rs.classavgscore,rs.schoolrank
             ,rs.schoolmaxscore,rs.schoolavgscore,rs.goal,rs.nextgoal
         </if>
         from e_rstudent rs where rs.examid=#{examid} and rs.studentid=#{studentid} and rs.subjectid=#{subjectid}
@@ -93,7 +109,7 @@
             ,0 stuscore,0 stusrate,0 gradescore,0 gradesrate,0 gradeavgscore
             ,0 classscore,0 classsrate,0 classavgscore
         </if>
-        <if test="showrank==1">
+        <if test="showrank!=0">
             ,sp.stuscore,sp.stusrate,cp.gradescore,cp.gradesrate,cp.gradeavgscore
             ,cp.classscore,cp.classsrate,cp.classavgscore
         </if>
@@ -108,7 +124,7 @@
             ,0 stuscore,0 stusrate,0 gradescore,0 gradeavgscore,0 gradesrate
             ,0 classscore,0 classavgscore,0 classsrate
         </if>
-        <if test="showrank==1">
+        <if test="showrank!=0">
             ,sc.stuscore,sc.stusrate,cc.gradescore,cc.gradeavgscore,cc.gradesrate
             ,cc.classscore,cc.classavgscore,cc.classsrate
         </if>
@@ -123,7 +139,7 @@
             ,0 stuscore,0 stusrate,0 gradescore,0 gradesrate,0 gradeavgscore
             ,0 classscore,0 classsrate,0 classavgscore
         </if>
-        <if test="showrank==1">
+        <if test="showrank!=0">
             ,st.stuscore,st.stusrate,ct.gradescore,ct.gradesrate,ct.gradeavgscore
             ,ct.classscore,ct.classsrate,ct.classavgscore
         </if>
@@ -138,7 +154,7 @@
             ,0 stuscore,0 classscore,0 classsrate,0 gradescore,0 gradesrate
             ,0 gradeavgscore,0 classavgscore
         </if>
-        <if test="showrank==1">
+        <if test="showrank!=0">
             ,sq.stuscore,cq.classscore,cq.classsrate,cq.gradescore,cq.gradesrate
             ,cq.gradeavgscore,cq.classavgscore
         </if>
@@ -172,7 +188,7 @@
         <if test="showrank==0">
             ,0 classscore,0 classsrate,0 gradescore,0 gradesrate,0 classavgscore,0 gradeavgscore
         </if>
-        <if test="showrank==1">
+        <if test="showrank!=0">
             ,cq.classscore,cq.classsrate,cq.gradescore,cq.gradesrate,cq.classavgscore,cq.gradeavgscore
         </if>
         from e_rclass_question cq
@@ -181,12 +197,6 @@
     </select>
     <select id="listSubjectQuestionsStuScore" resultType="java.util.Map">
         select sq.stuscore,sq.qscore,sq.questionid squestionid
-        <!--<if test="showrank==0">-->
-        <!--    ,0 stuscore-->
-        <!--</if>-->
-        <!--<if test="showrank==1">-->
-        <!--    ,sq.stuscore-->
-        <!--</if>-->
         from e_paper_student_question sq
         left join t_question q on sq.questionid=q.questionid
         where sq.studentid=#{studentid} and sq.epid=#{epid} and (q.questionid=#{questionid} or q.questionpid=#{questionid})
@@ -245,7 +255,7 @@
         <if test="showrank==0">
             ,0 stuscore,0 classavgscore,0 gradeavgscore
         </if>
-        <if test="showrank==1">
+        <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
@@ -273,7 +283,7 @@
         <if test="showrank==0">
             ,0 stuscore,0 classavgscore,0 gradeavgscore
         </if>
-        <if test="showrank==1">
+        <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
@@ -296,7 +306,7 @@
         </collection>
     </resultMap>
     <select id="listStudentSubjectErrorQues" resultMap="listStudentSubjectErrorQues">
-        <if test="showrank==1">
+        <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