更改作业考试集合sum时精度问题

sexam/src/main/java/com/xhkjedu/sexam/service/paper/EPaperQtypeService.java

@@ -339,6 +339,7 @@ public class EPaperQtypeService {
             for(Map.Entry<String, List<QuestionOrderVo>> entry : complxmap.entrySet()){
                 List<QuestionOrderVo> pgblist = entry.getValue();
                 Double score = pgblist.stream().mapToDouble(s -> s.getScore()).sum();
+                score = N_Utils.formatDouble(score,1);
                 Double srate = N_Utils.getDoubleDivideAndMulitiply(score,ePaper.getPscore());
                 Map prate = new TreeMap();
                 prate.put("level",Integer.parseInt(entry.getKey()));
@@ -358,6 +359,7 @@ public class EPaperQtypeService {
                 List<QuestionOrderVo> pgblist = entry.getValue();
                 //获取知识点的总分
                 Double score = pgblist.stream().mapToDouble(s -> s.getScore()).sum();
+                score = N_Utils.formatDouble(score,1);
                 Double srate = N_Utils.getDoubleDivideAndMulitiply(score,ePaper.getPscore());
                 Map prate = new TreeMap();
                 prate.put("pointid",entry.getKey());
@@ -615,6 +617,7 @@ public class EPaperQtypeService {
             List<EPaperQtype> aq = entry.getValue();
             int num = aq.stream().mapToInt(EPaperQtype::getEptnum).sum();
             double tscore = aq.stream().collect(Collectors.summingDouble(EPaperQtype:: getEptscore));
+            tscore = N_Utils.formatDouble(tscore,1);
             double storerate = N_Utils.getDoubleDivideAndMulitiply(tscore, ePaper.getPscore());
             //获取小题题号
 

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

@@ -1841,7 +1841,9 @@ public class EReportGenerateService {
                 gstunum = qgstulist.size();
                 EPaperStudentQuestion qgmaxstu = qgstulist.stream().max(Comparator.comparing(EPaperStudentQuestion::getStuscore)).get();
                 Double qgscore = qgstulist.stream().mapToDouble(EPaperStudentQuestion::getQscore).sum();
+                qgscore = N_Utils.formatDouble(qgscore,1);
                 Double qgstuscore = qgstulist.stream().mapToDouble(EPaperStudentQuestion::getStuscore).sum();
+                qgstuscore = N_Utils.formatDouble(qgstuscore,1);
                 Double qgavgscore = N_Utils.getDoubleDivideForAvg(qgstuscore, gstunum);//年级平均分
                 Double qgsrate = N_Utils.getDoubleDivideAndMulitiply(qgstuscore, qgscore);
                 tgscore = ExamUtil.add(tgscore, qgscore);
@@ -1855,7 +1857,9 @@ public class EReportGenerateService {
                         int cstunum = qcstulist.size();//班级下试题作答学生数量
                         EPaperStudentQuestion qcmaxstu = qcstulist.stream().max(Comparator.comparing(EPaperStudentQuestion::getStuscore)).get();
                         Double qcscore = qcstulist.stream().mapToDouble(EPaperStudentQuestion::getQscore).sum();
+                        qcscore = N_Utils.formatDouble(qcscore,1);
                         Double qcstuscore = qcstulist.stream().mapToDouble(EPaperStudentQuestion::getStuscore).sum();
+                        qcstuscore = N_Utils.formatDouble(qcstuscore,1);
                         Double qcavgscore = N_Utils.getDoubleDivideForAvg(qcstuscore, cstunum);
                         Double qcsrate = N_Utils.getDoubleDivideAndMulitiply(qcstuscore, qcscore);
 
@@ -2013,7 +2017,9 @@ public class EReportGenerateService {
                         pstq.setStudentid(entry.getKey());
 
                         Double qstuscore = stuqueslist.stream().mapToDouble(EPaperStudentQuestion::getStuscore).sum();
+                        qstuscore = N_Utils.formatDouble(qstuscore,1);
                         Double qscore = stuqueslist.stream().mapToDouble(EPaperStudentQuestion::getQscore).sum();
+                        qscore = N_Utils.formatDouble(qscore,1);
                         pstq.setQscore(qscore);
                         pstq.setStuscore(qstuscore);
                         pstq.setCtype(11);//母子题关系的均设置为复合题，不再进行选项区分
@@ -2039,7 +2045,9 @@ public class EReportGenerateService {
 
                 gstunum = qgstulist.size();
                 Double qgscore = qgstulist.stream().mapToDouble(EPaperStudentQuestion::getQscore).sum();
+                qgscore = N_Utils.formatDouble(qgscore,1);
                 Double qgstuscore = qgstulist.stream().mapToDouble(EPaperStudentQuestion::getStuscore).sum();
+                qgstuscore = N_Utils.formatDouble(qgstuscore,1);
                 EPaperStudentQuestion qgmaxscore = qgstulist.stream().max(Comparator.comparing(EPaperStudentQuestion::getStuscore)).get();
                 tgscore = ExamUtil.add(tgscore, qgscore);
                 tgstuscore = ExamUtil.add(tgstuscore, qgstuscore);
@@ -2050,7 +2058,9 @@ public class EReportGenerateService {
                     if(N_Utils.isListNotEmpty(qcstulist)){
                         int cstunum = qcstulist.size();//班级下试题作答学生数量
                         Double qcscore = qcstulist.stream().mapToDouble(EPaperStudentQuestion::getQscore).sum();
+                        qcscore = N_Utils.formatDouble(qcscore,1);
                         Double qcstuscore = qcstulist.stream().mapToDouble(EPaperStudentQuestion::getStuscore).sum();
+                        qcstuscore = N_Utils.formatDouble(qcstuscore,1);
                         Double qcavgscore = N_Utils.getDoubleDivideForAvg(qcstuscore,cstunum);
                         EPaperStudentQuestion maxscore = qcstulist.stream().max(Comparator.comparing(EPaperStudentQuestion::getStuscore)).get();
 
@@ -2188,6 +2198,7 @@ public class EReportGenerateService {
                     for (Map.Entry<Integer, List<EPaperStudentQuestion>> entry : stuquesmap.entrySet()) {
                         List<EPaperStudentQuestion> stuques = entry.getValue();
                         Double stuscore = stuques.stream().mapToDouble(EPaperStudentQuestion::getStuscore).sum();
+                        stuscore = N_Utils.formatDouble(stuscore,1);
                         EPaperStudentQuestion sqfirst = stuques.get(0);
                         EPaperStudentQuestion sq = new EPaperStudentQuestion();
                         sq.setStudentid(entry.getKey());
@@ -2216,6 +2227,7 @@ public class EReportGenerateService {
             for (Map.Entry<Integer, List<ERPointStuScoreVo>> entry : pointstuscoremap.entrySet()) {
                 List<ERPointStuScoreVo> stuscorelist = entry.getValue();
                 Double stuscore = stuscorelist.stream().mapToDouble(ERPointStuScoreVo::getStuscore).sum();
+                stuscore = N_Utils.formatDouble(stuscore,1);
                 ERPointStuScoreVo sscorevofirst = stuscorelist.get(0);
                 ERPointStuScoreVo sscorevo = new ERPointStuScoreVo();
                 sscorevo.setStudentid(sscorevofirst.getStudentid());
@@ -2225,6 +2237,7 @@ public class EReportGenerateService {
             }
 
             Double gstuscore = pointstuscorelist.stream().mapToDouble(ERPointStuScoreVo::getStuscore).sum();
+            gstuscore = N_Utils.formatDouble(gstuscore,1);
             Double gavgscore = N_Utils.getDoubleDivideForAvg(gstuscore, pointstuscorelist.size());
             Double gsrate = N_Utils.getDoubleDivideAndMulitiply(gstuscore, pointscore * pointstuscorelist.size());
 
@@ -2233,6 +2246,7 @@ public class EReportGenerateService {
                 List<ERPointStuScoreVo> classpointstulist = pointstuscorelist.stream().filter(s -> s.getClassid().equals(classid)).collect(Collectors.toList());
                 if(N_Utils.isListNotEmpty(classpointstulist)){
                     Double cstuscore = classpointstulist.stream().mapToDouble(ERPointStuScoreVo::getStuscore).sum();
+                    cstuscore = N_Utils.formatDouble(cstuscore,1);
 //                Double cscore = classpointstulist.stream().mapToDouble(ERPointStuScoreVo::getScore).sum();
                     Double cavgscore = N_Utils.getDoubleDivideForAvg(cstuscore, classpointstulist.size());
                     Double csrate = N_Utils.getDoubleDivideAndMulitiply(cstuscore, pointscore * classpointstulist.size());
@@ -2343,7 +2357,9 @@ public class EReportGenerateService {
                 pstq.setStudentid(entry.getKey());
                 pstq.setClassid(pfirst.getClassid());
                 Double qstuscore = stuqueslist.stream().mapToDouble(EPaperStudentQuestion::getStuscore).sum();
+                qstuscore = N_Utils.formatDouble(qstuscore,1);
                 Double qscore = stuqueslist.stream().mapToDouble(EPaperStudentQuestion::getQscore).sum();
+                qscore = N_Utils.formatDouble(qscore,1);
                 pstq.setQscore(qscore);
                 pstq.setStuscore(qstuscore);
                 qgstulist.add(pstq);
@@ -2361,7 +2377,9 @@ public class EReportGenerateService {
             }
 
             Double tgstuscore = qgstulist.stream().mapToDouble(EPaperStudentQuestion::getStuscore).sum();//难易度下学生得分
+            tgstuscore = N_Utils.formatDouble(tgstuscore,1);
             Double tgscore = qgstulist.stream().mapToDouble(EPaperStudentQuestion::getQscore).sum();//难易度下试题总分
+            tgscore = N_Utils.formatDouble(tgscore,1);
             Double tgsrate = N_Utils.getDoubleDivideAndMulitiply(tgstuscore, tgscore);//年级得分率
             Double tgavgscore = N_Utils.getDoubleDivideForAvg(tgstuscore,qgstulist.size());
 
@@ -2371,7 +2389,9 @@ public class EReportGenerateService {
                 List<EPaperStudentQuestion> qcstulist = qgstulist.stream().filter(s -> s.getClassid().equals(classid)).collect(Collectors.toList());
                 if(N_Utils.isListNotEmpty(qcstulist)){
                     Double qcscore = qcstulist.stream().mapToDouble(EPaperStudentQuestion::getQscore).sum();
+                    qcscore = N_Utils.formatDouble(qcscore,1);
                     Double qcstuscore = qcstulist.stream().mapToDouble(EPaperStudentQuestion::getStuscore).sum();
+                    qcstuscore = N_Utils.formatDouble(qcstuscore,1);
                     Double qcavgscore = N_Utils.getDoubleDivideForAvg(qcstuscore,qcstulist.size());
 
                     ERclassComplexity erc = new ERclassComplexity();

sstudy/src/main/java/com/xhkjedu/sstudy/controller/paper/PaperController.java

@@ -304,8 +304,8 @@ public class PaperController {
 
     //该方法用于重新生成之前的作业报告
     @GetMapping("/hpa")
-    public ResultVo handlePaperAnalyze() {
-        paperService.listPapersForAnalyze();
+    public ResultVo handlePaperAnalyze(Integer paperid) {
+        paperService.listPapersForAnalyze(paperid);
         return new ResultVo(0, "成功处理作业分析");
     }
 }

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/paper/PaperMapper.java

@@ -149,5 +149,5 @@ public interface PaperMapper extends TkMapper<TPaper> {
     String getSubjectIdByPid(@Param("paperid") Long paperid);
 
     //获取所有试卷用于重新生成分析
-    List<TPaper> listPapersForAnalyze();
+    List<TPaper> listPapersForAnalyze(@Param("paperid") Integer paperid);
 }

sstudy/src/main/java/com/xhkjedu/sstudy/service/paper/PaperService.java

@@ -267,6 +267,7 @@ public class PaperService {
             List<TPaperScantronQtype> aq = entry.getValue();
             int num = aq.stream().mapToInt(TPaperScantronQtype::getPstnum).sum();
             double tscore = aq.stream().collect(Collectors.summingDouble(TPaperScantronQtype:: getPstscore));
+            tscore = N_Utils.formatDouble(tscore,1);
             double storerate = N_Utils.getDoubleDivideAndMulitiply(tscore, paper.getPaperscore());
             //获取小题题号
             List<Integer> orderlist = new ArrayList<>();
@@ -592,6 +593,7 @@ public class PaperService {
         List<PaperQtypeQuesVo> ktlst = mquestions.stream().filter(q->q.getMctype() == 111).collect(Collectors.toList());
         int ktnum = ktlst.size();
         double ktscore = ktlst.stream().collect(Collectors.summingDouble(PaperQtypeQuesVo:: getPtqscore));
+        ktscore = N_Utils.formatDouble(ktscore,1);
         double ktnrate = N_Utils.getIntegerDivideAndMulitiply(ktnum, paper.getPapernum());
         double ktsrate = N_Utils.getDoubleDivideAndMulitiply(ktscore, paper.getPaperscore());
         List<PaperQsVo> ranglist = new ArrayList<>();
@@ -615,6 +617,7 @@ public class PaperService {
             for(Map.Entry<String, List<QuestionOrderVo>> entry : complxmap.entrySet()){
                 List<QuestionOrderVo> pgblist = entry.getValue();
                 Double score = pgblist.stream().mapToDouble(s -> s.getScore()).sum();
+                score = N_Utils.formatDouble(score,1);
                 Double srate = N_Utils.getDoubleDivideAndMulitiply(score,paper.getPaperscore());
                 Map prate = new TreeMap();
                 prate.put("level",Integer.parseInt(entry.getKey()));
@@ -634,6 +637,7 @@ public class PaperService {
                 List<QuestionOrderVo> pgblist = entry.getValue();
                 //获取知识点的总分
                 Double score = pgblist.stream().mapToDouble(s -> s.getScore()).sum();
+                score = N_Utils.formatDouble(score,1);
                 Double srate = N_Utils.getDoubleDivideAndMulitiply(score,paper.getPaperscore());
                 Map prate = new TreeMap();
                 prate.put("pointid",entry.getKey());
@@ -1206,8 +1210,8 @@ public class PaperService {
     }
 
     //处理作业分析
-    public void listPapersForAnalyze(){
-        List<TPaper> papers = paperMapper.listPapersForAnalyze();
+    public void listPapersForAnalyze(Integer paperid){
+        List<TPaper> papers = paperMapper.listPapersForAnalyze(paperid);
         for(TPaper p : papers){
             if(p.getPapertype() == 1){
                 //题库

sstudy/src/main/resources/mapper/paper/PaperMapper.xml

@@ -299,6 +299,10 @@
 
     <!--获取所有试卷用于重新生成分析-->
     <select id="listPapersForAnalyze" resultType="com.xhkjedu.sstudy.model.paper.TPaper">
-        select * from t_paper order by paperid
+        select * from t_paper
+        <if test="paperid!=null and paperid!=''">
+            where paperid=#{paperid}
+        </if>
+        order by paperid
     </select>
 </mapper>