Merge remote-tracking branch 'origin/ywx' into wn

smarking/src/main/java/com/xhkjedu/smarking/model/report/reportclass/MsrClassSubjectGrade.java

@@ -23,6 +23,8 @@ public class MsrClassSubjectGrade extends BaseBean {
     private Integer classid;
     //科目ID（含总分）
     private String subjectid;
+    //归属报告模块编码：zh综合报告 xj校级报告 xk学科报告 bj班级报告 xs学生报告 mtzl命题质量报告 jxzl教学质量报告 xksy学科素养报告
+    private String reportcode;
     //四率/等级
     private String range;
     //四率对应人数
@@ -31,14 +33,10 @@ public class MsrClassSubjectGrade extends BaseBean {
     private Integer rangenumrank;
     //四率对应率
     private Double rangerate;
-    //全科四率对应人数
-    private Integer qkrangenum;
-    //全科四率对应人数排名
-    private Integer qkrangenumrank;
-    //全科四率对应率
-    private Double qkrangerate;
     //等级分值
     private Double djscore;
     //等级得分率比例
     private Double djrate;
+    //学生id字符串
+    private String stuids;
 }

smarking/src/main/java/com/xhkjedu/smarking/model/report/reportclass/MsrClassTop.java

@@ -31,12 +31,12 @@ public class MsrClassTop extends BaseBean {
     private Double btrate;
     //班前60%人数平均分
     private Double btavgscore;
-    //班前60%生学id字符串
+    //班前60%学生id字符串
     private String btstuids;
     //校级前60%人数
     private Integer xtnum;
     //校前60%人数平均分
     private Double xtavgscore;
-    //校前60%生学id字符串
+    //校前60%学生id字符串
     private String xtstuids;
 }

smarking/src/main/java/com/xhkjedu/smarking/model/report/reportsubject/MsrSubjectClass.java

@@ -31,6 +31,6 @@ public class MsrSubjectClass extends BaseBean {
     private Double qjrate;
     //区间平均得分率
     private Double qjavgrate;
-    //生学id字符串
+    //学生id字符串
     private String stuids;
 }

smarking/src/main/java/com/xhkjedu/smarking/service/report/reportother/MsrExamService.java

@@ -2,8 +2,7 @@ package com.xhkjedu.smarking.service.report.reportother;
 
 import com.alibaba.fastjson.JSON;
 import com.xhkjedu.smarking.mapper.exam.*;
-import com.xhkjedu.smarking.mapper.report.reportclass.MsrClassSubjectMapper;
-import com.xhkjedu.smarking.mapper.report.reportclass.MsrClassTopMapper;
+import com.xhkjedu.smarking.mapper.report.reportclass.*;
 import com.xhkjedu.smarking.mapper.report.reportother.MsrExamMapper;
 import com.xhkjedu.smarking.mapper.report.reportother.MsrReportparamMapper;
 import com.xhkjedu.smarking.mapper.report.reportstu.MsrStudentMapper;
@@ -12,8 +11,7 @@ import com.xhkjedu.smarking.mapper.report.reportsubject.MsrSubjectMapper;
 import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentMapper;
 import com.xhkjedu.smarking.model.exam.*;
 import com.xhkjedu.smarking.model.paper.MsPaper;
-import com.xhkjedu.smarking.model.report.reportclass.MsrClassSubject;
-import com.xhkjedu.smarking.model.report.reportclass.MsrClassTop;
+import com.xhkjedu.smarking.model.report.reportclass.*;
 import com.xhkjedu.smarking.model.report.reportother.MsrExam;
 import com.xhkjedu.smarking.model.report.reportother.MsrReportparam;
 import com.xhkjedu.smarking.model.report.reportstu.MsrStudent;
@@ -60,6 +58,8 @@ public class MsrExamService {
     private MsrClassSubjectMapper msrClassSubjectMapper;
     @Resource
     private MsrClassTopMapper msrClassTopMapper;
+    @Resource
+    private MsrClassSubjectGradeMapper msrClassSubjectGradeMapper;
 
 
     /**
@@ -87,7 +87,7 @@ public class MsrExamService {
         }
 
         //等级参数
-        List<MsrReportparam> djParams = msrReportparamMapper.listReportparamByRpbelong(examid, "subjectshow", "");
+        List<MsrReportparam> djParams = msrReportparamMapper.listReportparamByRpbelong(examid, "subjectshow", "all");
         List<SzJsonVo> djList = new ArrayList<>();
         if (N_Utils.isListNotEmpty(djParams)) {
             djList = JSON.parseArray(djParams.get(0).getSzjson(), SzJsonVo.class);
@@ -259,11 +259,7 @@ public class MsrExamService {
 
         //科目班级分数分布区间分析、班级学科分析
         //区间参数
-        List<MsrReportparam> qjParams = msrReportparamMapper.listReportparamByRpbelong(examid, "scoresection", "xk");
-        Map<String, List<SzJsonVo>> qjMap = new HashMap<>();
-        for (MsrReportparam param : qjParams) {
-            qjMap.put(param.getSubjectid(), JSON.parseArray(param.getSzjson(), SzJsonVo.class));
-        }
+        Map<String, List<SzJsonVo>> qjMap = getReportParams(examid, "scoresection", "xk");
         List<MsrSubjectClass> msrSubjectClasses = new ArrayList<>();//科目班级分数分布区间分析
         List<MsrClassSubject> msrClassSubjects = new ArrayList<>();//班级学科分析
         List<MsrClassTop> msrClassTops = new ArrayList<>();//班级学科前60分析
@@ -349,9 +345,80 @@ public class MsrExamService {
         msrClassSubjectMapper.insertList(msrClassSubjects);
         msrClassTopMapper.insertList(msrClassTops);
 
+        saveClassSubjectGrade(examid, "scorerate", "zh", msrStudents);//综合报告-班级学科四率等级分析
+        saveClassSubjectGrade(examid, "scorerate", "xj", msrStudents);//校级报告-班级学科四率等级分析
+
         examMapper.updateExamState(examid, 3);
     }
 
+    //班级学科四率等级分析
+    private void saveClassSubjectGrade(Integer examid, String rpbelong, String reportcode, List<MsrStudent> msrStudents) {
+        Map<String, List<SzJsonVo>> qjMap = getReportParams(examid, rpbelong, reportcode);
+        List<MsrClassSubjectGrade> msrClassSubjectGrades = new ArrayList<>();//班级学科分析
+        String subjectid;
+        int totalnum;
+        Map<String, List<MsrStudent>> scCollect = msrStudents.stream().collect(Collectors.groupingBy(s -> s.getClassid() + "_" + s.getSubjectid()));
+        List<Integer> nums = new ArrayList<>();
+        for (Map.Entry<String, List<MsrStudent>> entry : scCollect.entrySet()) {
+            String key = entry.getKey();
+            Integer classid = N_Utils.obj2Int(key.split("_")[0]);
+            subjectid = key.split("_")[1];
+            List<SzJsonVo> list = qjMap.get(subjectid);
+            List<MsrStudent> studentList = entry.getValue();
+            totalnum = studentList.size();//区间总人数
+            Double fullscore1 = studentList.get(0).getFullscore();
+            List<RankGroupVo> fdScore = MarkingUtil.fdScore(fullscore1, N_Utils.obj2Int(list.get(0).getDjvalue()));
+            for (RankGroupVo rg : fdScore) {
+                int minscore = rg.getMinvalue();
+                int maxscore = rg.getMaxvalue();
+                String qjname = rg.getGroupname();
+                double min = MarkingUtil.objToDouble(minscore);
+                double max = MarkingUtil.objToDouble(maxscore);
+                List<MsrStudent> qjstudents;
+                if (fullscore1.compareTo(max) == 0) {
+                    qjstudents = studentList.stream().filter(s -> s.getStuscore().compareTo(min) >= 0).collect(Collectors.toList());
+                } else {
+                    qjstudents = studentList.stream().filter(s -> s.getStuscore().compareTo(min) >= 0 && s.getStuscore().compareTo(max) < 0).collect(Collectors.toList());
+                }
+                int qjnum = qjstudents.size();
+                MsrClassSubjectGrade classSubjectGrade = new MsrClassSubjectGrade();
+                classSubjectGrade.setExamid(examid);
+                classSubjectGrade.setSubjectid(subjectid);
+                classSubjectGrade.setClassid(classid);
+                classSubjectGrade.setReportcode(reportcode);
+                classSubjectGrade.setRange(qjname);
+                classSubjectGrade.setRangenum(qjnum);
+                classSubjectGrade.setRangerate(N_Utils.getIntegerDivideAndMulitiply(qjnum, totalnum));
+                //double qjavg = qjstudents.stream().mapToDouble(MsrStudent::getStuscore).summaryStatistics().getAverage();
+                //classSubjectGrade.setQjavgrate(N_Utils.getDoubleDivideAndMulitiply(qjavg, fullscore1));
+                String stuids = qjstudents.stream().map(s -> s.getStudentid().toString()).collect(Collectors.joining(","));
+                classSubjectGrade.setStuids(stuids);
+                msrClassSubjectGrades.add(classSubjectGrade);
+                nums.add(qjnum);
+            }
+        }
+        Map<Integer, Integer> rspm = MarkingUtil.rspm(nums);//人数排名
+        for (MsrClassSubjectGrade classSubjectGrade : msrClassSubjectGrades) {
+            int rangenum = classSubjectGrade.getRangenum();
+            int rank = rspm.get(rangenum);
+            classSubjectGrade.setRangenumrank(rank);
+        }
+        msrClassSubjectGradeMapper.insertList(msrClassSubjectGrades);
+    }
+
+    //获取报告参数
+    private Map<String, List<SzJsonVo>> getReportParams(Integer examid, String rpbelong, String reportcode) {
+        List<MsrReportparam> list = msrReportparamMapper.listReportparamByRpbelong(examid, rpbelong, reportcode);
+        if (N_Utils.isListEmpty(list)) {
+            list = msrReportparamMapper.listReportparamByRpbelong(examid, rpbelong, "all");
+        }
+        Map<String, List<SzJsonVo>> qjMap = new HashMap<>();
+        for (MsrReportparam param : list) {
+            qjMap.put(param.getSubjectid(), JSON.parseArray(param.getSzjson(), SzJsonVo.class));
+        }
+        return qjMap;
+    }
+
     //设置科目分析计算参数
     private void setSubject(MsrSubject msrSubject, List<MsrStudent> schoolStudents2) {
         Double avgscore = msrSubject.getAvgscore();

smarking/src/main/java/com/xhkjedu/smarking/utils/MarkingUtil.java

@@ -577,12 +577,34 @@ public class MarkingUtil {
 
     //分数排名
     public static Map<Double,Integer> fspm(List<Double> scores) {
+        //倒序排
+        Collections.sort(scores, Collections.reverseOrder());
         // 创建一个地图来存储分数和出现次数
         Map<Double, Integer> scoreCountMap = new HashMap<>();
 
-        // 遍历 scores 计算分数出现的次数
-        for (Double score : scores) {
-            scoreCountMap.put(score, scoreCountMap.getOrDefault(score, 0) + 1);
+        int rank = 1;
+        Map<Double, List<Double>> collect = scores.stream().collect(Collectors.groupingBy(s -> s, LinkedHashMap::new, Collectors.toList()));
+        for (Map.Entry<Double, List<Double>> entry : collect.entrySet()) {
+            Double key = entry.getKey();
+            scoreCountMap.put(key, rank);
+            rank += entry.getValue().size();
+        }
+        return scoreCountMap;
+    }
+
+    //人数排名
+    public static Map<Integer,Integer> rspm(List<Integer> nums) {
+        //倒序排
+        Collections.sort(nums, Collections.reverseOrder());
+        // 创建一个地图来存储分数和出现次数
+        Map<Integer, Integer> scoreCountMap = new HashMap<>();
+
+        int rank = 1;
+        Map<Integer, List<Integer>> collect = nums.stream().collect(Collectors.groupingBy(s -> s, LinkedHashMap::new, Collectors.toList()));
+        for (Map.Entry<Integer, List<Integer>> entry : collect.entrySet()) {
+            Integer key = entry.getKey();
+            scoreCountMap.put(key, rank);
+            rank += entry.getValue().size();
         }
         return scoreCountMap;
     }

smarking/src/main/java/com/xhkjedu/smarking/vo/report/reportclass/ClassTopVo.java

@@ -17,6 +17,6 @@ public class ClassTopVo {
     private Integer xtnum;
     //校前60%人数平均分
     private Double xtavgscore;
-    //校前60%生学id字符串
+    //校前60%学生id字符串
     private String xtstuids;
 }

smarking/src/main/resources/mapper/exam/MsExamMapper.xml

@@ -24,7 +24,8 @@
     </delete>
     <!--考试科目列表-->
     <select id="listSubject" resultType="java.util.Map">
-        select subjectname,if(pstate=1 and ptstate=2 and pbstate=2 and checkstate!=0 and checkset=1
+        select subjectid,subjectname
+        ,if(pstate=1 and ptstate=2 and pbstate=2 and checkstate!=0 and checkset=1
         and (#{exammode}!=3 or invigilatestate=2)
         and (select count(ps.mpsid) from ms_paper_student ps where ps.msid=s.msid and ps.sstate=2 and ps.checked!=2)=0
         ,1,0) as state

smarking/src/main/resources/mapper/papercheck/MsPaperCheckTeacherTaskMapper.xml

@@ -195,11 +195,15 @@
     </select>
     <!--教师阅卷-待/已阅卷列表-->
     <select id="listCorrect" resultType="java.util.Map">
-        select s.msid,s.subjectname,s.sdate,s.begintime,s.endtime,e.examname,e.gradeid,e.examtype,e.exammode
+        select t.msid,t.subjectname,t.sdate,t.begintime,t.endtime,t.examname,t.gradeid,t.examtype,t.exammode
+        ,t.mpid,t.checktype,t.dispenseway,t.numtype,t.correcttype
+        ,truncate(t.checkedNum*100/t.totalNum,2) as checkrate
+        from(select s.msid,s.subjectname,s.sdate,s.begintime,s.endtime,e.examname,e.gradeid,e.examtype,e.exammode
         ,pc.mpid,pc.checktype,pc.dispenseway,pc.numtype,pc.correcttype
-        ,truncate((count(distinct if(psb.firstcid = #{param.handleid} and psb.firstcime>0,psb.mpsbid,null))
-        +count(distinct if(pc.checktype=2 and psb.secondcid = #{param.handleid} and psb.secondctime>0,psb.mpsbid,null))
+        ,truncate((count(distinct if(psb.firstcime>0 or psb.secondctime>0,psb.mpsbid,null))
         )*100/count(distinct psb.mpsbid),2) as checkrate
+        ,count(distinct if(psb.firstcime>0 or psb.secondctime>0,psb.mpsbid,null)) as checkedNum
+        ,count(distinct psb.mpsbid) as totalNum
         from ms_subject s inner join ms_exam e on s.examid = e.examid
         inner join ms_paper_check pc on pc.msid = s.msid
         inner join ms_paper_check_teacher pct on pc.mblockid = pct.mblockid and pct.mpid=pc.mpid
@@ -214,6 +218,8 @@
         ,pc.mpid,pc.checktype,pc.dispenseway,pc.numtype,pc.correcttype
         ,truncate((count(distinct if(psb.firstcime>0 or psb.secondctime>0,psb.mpsqid,null))
         )*100/count(distinct psb.mpsqid),2) as checkrate
+        ,count(distinct if(psb.firstcime>0 or psb.secondctime>0,psb.mpsqid,null)) as checkedNum
+        ,count(distinct psb.mpsqid) as totalNum
         from ms_subject s inner join ms_exam e on s.examid = e.examid
         inner join ms_paper_check pc on pc.msid = s.msid
         inner join ms_paper_check_teacher pct on pc.mblockid = pct.mblockid and pct.mpid=pc.mpid
@@ -228,6 +234,8 @@
         ,pc.mpid,pc.checktype,pc.dispenseway,pc.numtype,pc.correcttype
         ,truncate((count(distinct if(psb.firstcime>0 or psb.secondctime>0,psb.mpsqid,null))
         )*100/count(distinct psb.mpsqid),2) as checkrate
+        ,count(distinct if(psb.firstcime>0 or psb.secondctime>0,psb.mpsqid,null)) as checkedNum
+        ,count(distinct psb.mpsqid) as totalNum
         from ms_subject s inner join ms_exam e on s.examid = e.examid
         inner join ms_paper_check pc on pc.msid = s.msid
         inner join ms_paper_check_teacher pct on pc.mblockid = pct.mblockid and pct.mpid=pc.mpid
@@ -242,6 +250,8 @@
         select s.msid,s.subjectname,s.sdate,s.begintime,s.endtime,e.examname,e.gradeid,e.examtype,e.exammode
         ,pc.mpid,pc.checktype,pc.dispenseway,pc.numtype,pc.correcttype
         ,truncate((count(distinct if(pctt.checkstate=3,pctt.mpcttid,null)))*100/count(distinct pctt.mpcttid),2) as checkrate
+        ,count(distinct if(pctt.checkstate=3,pctt.mpcttid,null)) as checkedNum
+        ,count(distinct pctt.mpcttid) as totalNum
         from ms_subject s inner join ms_exam e on s.examid = e.examid
         inner join ms_paper_check pc on pc.msid = s.msid
         inner join ms_paper_check_teacher_task pctt on pc.mblockid = pctt.mblockid and pctt.mpid=pc.mpid
@@ -250,6 +260,10 @@
         group by s.msid
         <if test="param.checktype==0">having 100>checkrate</if>
         <if test="param.checktype==1">having 100=checkrate</if>
+        )t
+        group by t.msid
+        <if test="param.checktype==0">having 100>checkrate</if>
+        <if test="param.checktype==1">having 100=checkrate</if>
         order by msid desc
     </select>
     <!--教师阅卷-待阅卷详情-->