班级报告-成绩等级分析科目排序

学生报告-报告概况-成绩单提交情况
班级报告-单科概况-等级统计

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

@@ -20,4 +20,7 @@ public interface ERclassRankMapper extends TkMapper<ERclassRank> {
 
     //获取等级分类
     Map getRank(@Param("rank") ERankParamVo rank);
+
+    //获取科目集合
+    List<Map> listSubjectByIds(@Param("subjectids") List<String> subjectids);
 }

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

@@ -17,10 +17,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -58,7 +55,25 @@ public class EReportClassService {
 
     //成绩分析-搜索
     public List<Map> listCjFxForSearch(ERankParamVo rank) {
-        return eRclassRankMapper.listByExamAndClassId(rank);
+        List<Map> list = eRclassRankMapper.listByExamAndClassId(rank);
+        if (N_Utils.isListEmpty(list)) return list;
+        //结果按照科目排序
+        List<String> subjectids = list.stream().map(m -> m.get("subjectid").toString()).distinct().collect(Collectors.toList());
+        List<Map> subjects = eRclassRankMapper.listSubjectByIds(subjectids);
+        Map<Object, Map> smap = subjects.stream().collect(Collectors.toMap(s -> s.get("subjectid"), s -> s));
+        if (smap == null) smap = new HashMap<>();
+        Map zf = new HashMap();
+        zf.put("subjectid", "zf");
+        zf.put("subjectname", "总分");
+        zf.put("subjectorder", 0);
+        smap.put("zf", zf);
+        for (Map map : list) {
+            Map s = smap.get(map.get("subjectid"));
+            map.put("subjectname", s.get("subjectname"));
+            map.put("subjectorder", s.get("subjectorder"));
+        }
+        list = list.stream().sorted(Comparator.comparing(s -> (int) s.get("subjectorder"))).collect(Collectors.toList());
+        return list;
     }
 
     //成绩分析-设置

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

@@ -24,8 +24,7 @@
     <select id="listByExamAndClassId" resultType="java.util.Map">
         select err.ranktype,err.rankname,err.rankrange,err.stunum,err.stujson,err.sturate
         ,err.classid,(case when err.classid=0 then '全部班级' else ec.classname end)classname
-        ,(case when err.subjectid='zf' then '总分' else (select s.subjectname from t_subject s where
-        err.subjectid=s.subjectid) end)subjectname
+        ,err.subjectid
         from e_rclass_rank err left join e_class ec on err.examid = ec.examid and err.classid = ec.classid
         where err.examid=#{rank.examid} and err.classid=#{rank.classid}
         <if test="rank.ranktype!=null and rank.ranktype!=0">
@@ -37,7 +36,7 @@
     </select>
     <!--班级报告-单科概况-等级统计-->
     <select id="listDkGkDjTj" resultType="java.util.Map">
-        select err.ranktype,err.rankname,err.stunum,err.stujson,err.sturate
+        select err.ranktype,err.rankname,err.stunum,err.stujson,err.sturate,er.minscore,er.maxscore
         ,(case when er.linescore is null then '' else concat(er.linescore,'-',er.floatscore) end)rankrange
         from e_rclass_rank err left join e_rrank er on err.examid = er.examid and err.subjectid = er.subjectid
         and er.ranktype=1 and er.rankname=err.rankname
@@ -56,4 +55,12 @@
         </if>
         limit 1
     </select>
+    <!--获取科目集合-->
+    <select id="listSubjectByIds" resultType="java.util.Map">
+        select subjectid,subjectname,subjectorder
+        from t_subject where subjectid in
+        <foreach collection="subjectids" item="subjectid" open="(" separator="," close=")">
+            #{subjectid}
+        </foreach>
+    </select>
 </mapper>

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

@@ -39,8 +39,13 @@
 
     <!--学生报告-报告概况-获取学生单次考试情况-->
     <select id="getStudentScoreByExamid" resultType="java.util.Map">
-        select rs.* from e_rstudent rs
-                             left join t_subject s on rs.subjectid=s.subjectid
+        select rs.*,eps.device,eps.submittype,eps.endtime
+        ,(case when rs.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)
+        from e_paper_student eps2 where eps2.examid=rs.examid and eps2.studentid=rs.studentid)
+        else eps.sstate end)sstate
+        from e_rstudent rs left join t_subject s on rs.subjectid=s.subjectid
+        left join e_paper_student eps on rs.examid=eps.examid and rs.subjectid=eps.subjectid and rs.studentid=eps.studentid
         where rs.examid=#{examid} and rs.studentid=#{studentid} order by s.subjectorder
     </select>
     <!--学生报告-报告概况-获取学生单次考试情况(学生无报告)-->