Merge remote-tracking branch 'cloud-schoolapi/ywx'

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

@@ -18,6 +18,7 @@ import com.xhkjedu.sexam.mapper.reportstu.ERstudentPointMapper;
 import com.xhkjedu.sexam.mapper.reportstu.ERstudentQtypeMapper;
 import com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion;
 import com.xhkjedu.sexam.model.report.ERbase;
+import com.xhkjedu.sexam.model.report.ERrank;
 import com.xhkjedu.sexam.model.report.ERsubject;
 import com.xhkjedu.sexam.model.reportclass.ERclass;
 import com.xhkjedu.sexam.model.reportclass.ERclassQtype;
@@ -32,7 +33,6 @@ 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.bouncycastle.operator.AADProcessor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -300,6 +300,92 @@ public class EReportGenerateService {
         eRstudentMapper.insertList(classSubjectStudents);
 
         setClassQuestion(examid, subjects, classes);//题型试题
+        setClassGradeRankAll(examid, papers, students);//班级、年级等级分布
+    }
+
+    //班级、年级等级分布
+    private void setClassGradeRankAll(Integer examid, List<ERPaperVo> papers, List<ERstudent> students) {
+        setClassGradeRank(examid, papers, students, setRrank(1));//班级、年级等级分布--等级
+        setClassGradeRank(examid, papers, students, setRrank(2));//班级、年级等级分布--分数段
+        setClassGradeRank(examid, papers, students, setRrank(3));//班级、年级等级分布--临界分
+        setClassGradeRank(examid, papers, students, setRrank(4));//班级、年级等级分布--临界名次
+        setClassGradeRank(examid, papers, students, setRrank(5));//班级、年级等级分布--优秀年级前
+        setClassGradeRank(examid, papers, students, setRrank(6));//班级、年级等级分布--学困年级后
+    }
+
+    //等级初始值设置
+    private List<ERrank> setRrank(Integer ranktype) {
+        List<ERrank> rranks = new ArrayList<>();
+        ERrank rrank;
+        if (ranktype == 1) {//等级（A[85%~100%],B[70%~85%),C[60%~70%),D[40%~60%),E[0%~40%)）
+            rrank = new ERrank();
+            rrank.setRanktype(ranktype);
+            rrank.setRankname("A");
+            rrank.setMaxscore(1.0);
+            rrank.setMinscore(0.85);
+            rranks.add(rrank);
+            rrank = new ERrank();
+            rrank.setRanktype(ranktype);
+            rrank.setRankname("B");
+            rrank.setMaxscore(0.85);
+            rrank.setMinscore(0.7);
+            rranks.add(rrank);
+            rranks.add(rrank);
+            rrank = new ERrank();
+            rrank.setRanktype(ranktype);
+            rrank.setRankname("C");
+            rrank.setMaxscore(0.7);
+            rrank.setMinscore(0.6);
+            rranks.add(rrank);
+            rranks.add(rrank);
+            rrank = new ERrank();
+            rrank.setRanktype(ranktype);
+            rrank.setRankname("D");
+            rrank.setMaxscore(0.6);
+            rrank.setMinscore(0.4);
+            rranks.add(rrank);
+            rranks.add(rrank);
+            rrank = new ERrank();
+            rrank.setRanktype(ranktype);
+            rrank.setRankname("E");
+            rrank.setMaxscore(0.4);
+            rrank.setMinscore(0.0);
+            rranks.add(rrank);
+        } else if (ranktype == 2) {//分数段（10分/段）
+            rrank = new ERrank();
+            rrank.setRanktype(ranktype);
+            rrank.setLinescore(10);
+            rranks.add(rrank);
+        } else if (ranktype == 3) {//临界分（临界分：总分*80%，浮动分：总分*70%）
+            rrank = new ERrank();
+            rrank.setRanktype(ranktype);
+            rrank.setLinescore(80);
+            rrank.setFloatscore(70);
+            rranks.add(rrank);
+        } else if (ranktype == 4) {//临界名次（临界名次10，浮动名次5）
+            rrank = new ERrank();
+            rrank.setRanktype(ranktype);
+            rrank.setLinescore(10);
+            rrank.setFloatscore(5);
+            rranks.add(rrank);
+        } else if (ranktype == 5) {//优秀年级前（10名）
+            rrank = new ERrank();
+            rrank.setRanktype(ranktype);
+            rrank.setLinescore(10);
+            rranks.add(rrank);
+        } else if (ranktype == 6) {//学困年级后（10名）
+            rrank = new ERrank();
+            rrank.setRanktype(ranktype);
+            rrank.setLinescore(10);
+            rranks.add(rrank);
+        }
+        return rranks;
+    }
+
+    //班级、年级等级分布
+    private void setClassGradeRank(Integer examid, List<ERPaperVo> papers, List<ERstudent> students, List<ERrank> rranks) {
+        double zfscore = papers.stream().mapToDouble(p -> p.getPscore()).sum();//考试总分
+        Integer ranktype = rranks.get(0).getRanktype();
     }
 
     //设置学生目标