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

# Conflicts:
#	sexam/src/main/java/com/xhkjedu/sexam/service/report/EReportGenerateService.java
#	sexam/src/main/java/com/xhkjedu/sexam/utils/ExamUtil.java

sexam/src/main/java/com/xhkjedu/sexam/model/reportclass/ERclass.java

@@ -37,9 +37,6 @@ public class ERclass extends BaseBean {
     //班级平均分
     private Double classavgscore;
 
-    //平均分排名
-    private Integer schoolrank;
-
     //校最高分
     private Double schoolmaxscore;
 

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

@@ -31,9 +31,9 @@ import com.xhkjedu.sexam.vo.paper.EPaperQtypeVo;
 import com.xhkjedu.sexam.vo.report.ERClassScoreVo;
 import com.xhkjedu.sexam.vo.report.ERPaperVo;
 import com.xhkjedu.utils.N_Utils;
+
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
-
 import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -85,8 +85,8 @@ public class EReportGenerateService {
         int stunum = classes.stream().mapToInt(m -> (int) m.get("classnum")).sum();
         int subjectnum = subjects.size();
 
-        String subjectid = "zf";
-        String subjectname = "总分";
+        String subjectid;
+        String subjectname;
         Map<String, String> subjectMap = subjects.stream().collect(Collectors.toMap(m -> m.get("subjectid").toString(),
                 m -> m.get("subjectname").toString()));
         Map<String, ERPaperVo> paperMap = papers.stream().collect(Collectors.toMap(m -> m.getSubjectid(), m -> m));
@@ -95,11 +95,10 @@ public class EReportGenerateService {
         List<ERstudent> schoolSubjectStudents = new ArrayList<>();//学校科目学生成绩
         List<ERstudent> classStudents = new ArrayList<>();//班级学生成绩
         List<ERstudent> classSubjectStudents = new ArrayList<>();//班级科目学生成绩
-        Map<String, Integer> schoolRank = new HashMap<>();//学校分数排名
-        Map<String, Integer> schoolSubjectRank = new HashMap<>();//学校科目分数排名
-        Map<String, Integer> classRank = new HashMap<>();//班级分数排名
-        Map<String, Integer> classSubjectRank = new HashMap<>();//班级科目分数排名
-
+        Map<String, Integer> schoolStuRank = new HashMap<>();//学校学生分数排名
+        Map<String, Integer> schoolSubStuRank = new HashMap<>();//学校科目学生分数排名
+        Map<String, Integer> classStuRank = new HashMap<>();//班级学生分数排名
+        Map<String, Integer> classSubStuRank = new HashMap<>();//班级科目学生分数排名
         List<ERstudent> students = ePaperStudentMapper.listByExamId(examid);
         Map<Integer, List<ERstudent>> schoolCollect = students.stream().collect(Collectors.groupingBy(s -> s.getStudentid()));
         for (Map.Entry<Integer, List<ERstudent>> entry : schoolCollect.entrySet()) {
@@ -112,7 +111,10 @@ public class EReportGenerateService {
         Map<Integer, List<ERstudent>> cCollect = students.stream().collect(Collectors.groupingBy(s -> s.getClassid()));
         for (Map.Entry<Integer, List<ERstudent>> entry : cCollect.entrySet()) {
             Integer classid = entry.getKey();
+            subjectid = "zf";
+            subjectname = "总分";
             List<ERstudent> studentList = entry.getValue();
+
             Map<Integer, List<ERstudent>> sCollect = studentList.stream().collect(Collectors.groupingBy(s -> s.getStudentid()));
             for (Map.Entry<Integer, List<ERstudent>> csEntry : sCollect.entrySet()) {
                 ERstudent cs = new ERstudent();
@@ -136,7 +138,6 @@ public class EReportGenerateService {
         }
 
         DoubleSummaryStatistics schoolStatistics = schoolStudents.stream().mapToDouble(s -> s.getScore()).summaryStatistics();
-        DoubleSummaryStatistics sSStatistics = schoolSubjectStudents.stream().mapToDouble(s -> s.getScore()).summaryStatistics();
         DoubleSummaryStatistics classStatistics = classStudents.stream().mapToDouble(s -> s.getScore()).summaryStatistics();
         DoubleSummaryStatistics cSStatistics = classSubjectStudents.stream().mapToDouble(s -> s.getScore()).summaryStatistics();
         double schoolStatisticsMax = schoolStatistics.getMax();
@@ -192,26 +193,58 @@ public class EReportGenerateService {
             rs.setMaxscore(statistics.getMax());
             rs.setMinscore(statistics.getMin());
             rs.setAvgscore(statistics.getAverage());
-            rs.setStunum(list.stream().filter(l -> l.getSstate() == 2).collect(Collectors.toList()).size());
-            rs.setMissnum(list.stream().filter(l -> l.getSstate() == 3).collect(Collectors.toList()).size());
+            int yxnum = list.stream().filter(l -> l.getScore().compareTo(yxscore) != -1)
+                    .collect(Collectors.toList()).size();
+            int lhnum = list.stream().filter(l -> l.getScore().compareTo(lhscore) != -1)
+                    .collect(Collectors.toList()).size();
+            int jgnum = list.stream().filter(l -> l.getScore().compareTo(jgscore) != -1)
+                    .collect(Collectors.toList()).size();
+            int dfnum = list.stream().filter(l -> l.getScore().compareTo(dfscore) != 1)
+                    .collect(Collectors.toList()).size();
+            List<Double> scores = list.stream().map(l -> l.getScore()).collect(Collectors.toList());
+            rs.setYxrate(N_Utils.getIntegerDivideAndMulitiply(yxnum, stunum));
+            rs.setLhrate(N_Utils.getIntegerDivideAndMulitiply(lhnum, stunum));
+            rs.setJgrate(N_Utils.getIntegerDivideAndMulitiply(jgnum, stunum));
+            rs.setDfrate(N_Utils.getIntegerDivideAndMulitiply(dfnum, stunum));
+            rs.setBzc(ExamUtil.standardDiviation(scores));
+            int sknum = list.size();
+            rs.setStunum(sknum);//实考人数
+            rs.setMissnum(stunum - sknum);//缺考人数=计划人数-实考人数
             subjectList.add(rs);
 
             Map<Integer, List<ERstudent>> claCollect = list.stream().collect(Collectors.groupingBy(s -> s.getClassid()));
             for (Map.Entry<Integer, List<ERstudent>> entry : claCollect.entrySet()) {
                 Integer classid = entry.getKey();
                 List<ERstudent> rstudentList = entry.getValue();
-                statistics = rstudentList.stream().mapToDouble(s -> s.getScore()).summaryStatistics();
+                DoubleSummaryStatistics claStatistics = rstudentList.stream().mapToDouble(s -> s.getScore()).summaryStatistics();
                 ERclass rc = new ERclass();
                 rc.setExamid(examid);
                 rc.setClassid(classid);
                 rc.setSubjectid(subjectid);
                 rc.setSubjectname(subjectname);
                 rc.setAllscore(allscore);
-                rc.setClassmaxscore(statistics.getMax());
-                rc.setClassminscore(statistics.getMin());
-                rc.setClassavgscore(statistics.getAverage());
-                rc.setStunum(rstudentList.stream().filter(l -> l.getSstate() == 2).collect(Collectors.toList()).size());
-                rc.setMissnum(rstudentList.stream().filter(l -> l.getSstate() == 3).collect(Collectors.toList()).size());
+                rc.setClassmaxscore(claStatistics.getMax());
+                rc.setClassminscore(claStatistics.getMin());
+                rc.setClassavgscore(claStatistics.getAverage());
+                rc.setSchoolmaxscore(statistics.getMax());
+                rc.setSchoolavgscore(statistics.getAverage());
+                sknum = rstudentList.size();
+                rc.setStunum(sknum);//实考人数
+                rc.setMissnum(stunum - sknum);//缺考人数=计划人数-实考人数
+                yxnum = rstudentList.stream().filter(l -> l.getScore().compareTo(yxscore) != -1)
+                        .collect(Collectors.toList()).size();
+                lhnum = rstudentList.stream().filter(l -> l.getScore().compareTo(lhscore) != -1)
+                        .collect(Collectors.toList()).size();
+                jgnum = rstudentList.stream().filter(l -> l.getScore().compareTo(jgscore) != -1)
+                        .collect(Collectors.toList()).size();
+                dfnum = rstudentList.stream().filter(l -> l.getScore().compareTo(dfscore) != 1)
+                        .collect(Collectors.toList()).size();
+                scores = rstudentList.stream().map(l -> l.getScore()).collect(Collectors.toList());
+                rc.setYxrate(N_Utils.getIntegerDivideAndMulitiply(yxnum, stunum));
+                rc.setLhrate(N_Utils.getIntegerDivideAndMulitiply(lhnum, stunum));
+                rc.setJgrate(N_Utils.getIntegerDivideAndMulitiply(jgnum, stunum));
+                rc.setDfrate(N_Utils.getIntegerDivideAndMulitiply(dfnum, stunum));
+                rc.setBzc(ExamUtil.standardDiviation(scores));
                 classList.add(rc);
                 List<EPaperQsVo> typelist = JSON.parseArray(rp.getQnumjson(), EPaperQsVo.class);
                 for (EPaperQsVo t : typelist) {
@@ -243,29 +276,31 @@ public class EReportGenerateService {
         eRclassMapper.insertList(classList);
         eRsubjectMapper.insertList(subjectList);
 
-        setRank(schoolStudents, schoolRank, 1);//学校分数排名
-        setRank(schoolSubjectStudents, schoolSubjectRank, 2);//学校科目分数排名
-        setRank(classStudents, classRank, 3);//班级分数排名
-        setRank(classSubjectStudents, classSubjectRank, 4);//班级科目分数排名
+        setRank(schoolStudents, schoolStuRank, 1);//学校学生分数排名
+        setRank(schoolSubjectStudents, schoolSubStuRank, 2);//学校科目学生分数排名
+        setRank(classStudents, classStuRank, 3);//班级学生分数排名
+        setRank(classSubjectStudents, classSubStuRank, 4);//班级科目学生分数排名
 
         for (ERstudent cs : classStudents) {
             Integer studentid = cs.getStudentid();
-            cs.setClassrank(classRank.get(cs.getClassid() + "_" + studentid));
+            cs.setClassrank(classStuRank.get(cs.getClassid() + "_" + studentid));
             cs.setClassmaxscore(classStatistics.getMax());
             cs.setClassavgscore(classStatistics.getAverage());
-            cs.setSchoolrank(schoolRank.get(studentid));
+            cs.setSchoolrank(schoolStuRank.get(studentid));
             cs.setSchoolmaxscore(schoolStatisticsMax);
             cs.setSchoolavgscore(schoolStatisticsAverage);
         }
         eRstudentMapper.insertList(classStudents);
 
+        DoubleSummaryStatistics sSStatistics = schoolSubjectStudents.stream().mapToDouble(s -> s.getScore()).summaryStatistics();
         for (ERstudent cs : classSubjectStudents) {
             Integer studentid = cs.getStudentid();
             Integer classid = cs.getClassid();
-            cs.setClassrank(classRank.get(classid + "_" + studentid));
-            cs.setClassmaxscore(classStatistics.getMax());
-            cs.setClassavgscore(classStatistics.getAverage());
-            cs.setSchoolrank(schoolSubjectRank.get(classid + "_" + cs.getSubjectid() + "_" + studentid));
+            subjectid = cs.getSubjectid();
+            cs.setClassrank(classSubStuRank.get(classid + "_" + subjectid + "_" + studentid));
+            cs.setClassmaxscore(cSStatistics.getMax());
+            cs.setClassavgscore(cSStatistics.getAverage());
+            cs.setSchoolrank(schoolSubStuRank.get(subjectid + "_" + studentid));
             cs.setSchoolmaxscore(sSStatistics.getMax());
             cs.setSchoolavgscore(sSStatistics.getAverage());
         }
@@ -286,13 +321,13 @@ public class EReportGenerateService {
                 Integer studentid = cgs.getStudentid();
                 Integer classid = cgs.getClassid();
                 String subjectid = cgs.getSubjectid();
-                if (code == 1) {//学校
+                if (code == 1) {//学校学生
                     key = studentid.toString();
-                } else if (code == 2) {//学校科目
+                } else if (code == 2) {//学校科目学生
                     key = subjectid + "_" + studentid;
-                } else if (code == 3) {//班级
+                } else if (code == 3) {//班级学生
                     key = classid + "_" + studentid;
-                } else {//班级科目
+                } else {//班级科目学生
                     key = classid + "_" + subjectid + "_" + studentid;
                 }
                 rank.put(key, index);

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

@@ -7,6 +7,7 @@ import java.math.BigInteger;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -113,7 +114,7 @@ public class ExamUtil {
     }
 
     //两数相减
-    public static long subtract(long a,long b){
+    public static long subtract(long a, long b) {
         BigInteger biginta = new BigInteger(a + "");
         BigInteger bigintb = new BigInteger(b + "");
         return biginta.subtract(bigintb).longValue();
@@ -130,6 +131,26 @@ public class ExamUtil {
         BigDecimal b1 = new BigDecimal(Double.toString(v1));
         BigDecimal b2 = new BigDecimal(Double.toString(v2));
 
-        return b1.multiply(b2).setScale(0,BigDecimal.ROUND_HALF_UP).doubleValue();
+        return b1.multiply(b2).setScale(0, BigDecimal.ROUND_HALF_UP).doubleValue();
+    }
+
+    //方差s^2=[(x1-x)^2 +...(xn-x)^2]/n 或者s^2=[(x1-x)^2 +...(xn-x)^2]/(n-1)
+    public static double variance(List<Double> x) {
+        int m = x.size();
+        double sum = 0;
+        for (int i = 0; i < m; i++) {//求和
+            sum += x.get(i);
+        }
+        double dAve = sum / m;//求平均值
+        double dVar = 0;
+        for (int i = 0; i < m; i++) {//求方差
+            dVar += (x.get(i) - dAve) * (x.get(i) - dAve);
+        }
+        return dVar / m;
+    }
+
+    //标准差σ=sqrt(s^2)
+    public static double standardDiviation(List<Double> x) {
+        return Math.sqrt(variance(x));
     }
 }

sexam/src/main/resources/mapper/paperstudent/EPaperStudentMapper.xml

@@ -190,6 +190,6 @@
 
     <select id="listByExamId" resultType="com.xhkjedu.sexam.model.reportstu.ERstudent">
         select classid,examid,subjectid,studentid,stuscore score,sstate
-        from e_paper_student where examid=#{examid}
+        from e_paper_student where examid=#{examid} and sstate!=0
     </select>
 </mapper>