完善知识点计算中的分值分布

scommons/src/main/java/com/xhkjedu/utils/N_Utils.java

@@ -1175,7 +1175,8 @@ public class N_Utils {
         BigDecimal bScore = new BigDecimal(Double.toString(score));
         BigDecimal bNum = new BigDecimal(Integer.toString(num));
 
-        BigDecimal avg = bScore.divide(bNum, 1, BigDecimal.ROUND_DOWN);
+        //2023-07-04通过四舍五入进行计算,
+        BigDecimal avg = bScore.divide(bNum, 1, BigDecimal.ROUND_HALF_UP);
         BigDecimal avgAllScore = avg.multiply(bNum);//平均分乘以数量得到的分值
         if (bScore.equals(avgAllScore)) {
             //说明整除
@@ -1187,4 +1188,13 @@ public class N_Utils {
             return new Double[]{avg.doubleValue(), lastScore.doubleValue()};
         }
     }
+
+    public static void main(String[] args) {
+        Double[] fz = getPointAvgScore(9, 20.0);
+        Double[] jg = getPointAvgScore(9,17.0);
+
+        System.out.println("20÷9：" + fz[0] + ";" + fz[1]);
+        System.out.println("17÷9：" + jg[0] + ";" + jg[1]);
+
+    }
 }

sstudy/src/main/java/com/xhkjedu/sstudy/service/paperreport/PaperReportService.java

@@ -995,19 +995,24 @@ public class PaperReportService {
                 List<PaperPointStuScoreVo> gradepointstulist = gradestulist.stream().filter(s -> s.getPointid().equals(pointid)).collect(Collectors.toList());
 
                 List<PaperPointStuScoreVo> pointstuscorelist = new ArrayList<>(); // 知识点下多个试题，处理成单个学生总分值情况
-                Map<Integer, List<PaperPointStuScoreVo>> pointstuscoremap = gradepointstulist.stream().collect(Collectors.groupingBy(PaperPointStuScoreVo::getStudentid));
-                for (Map.Entry<Integer, List<PaperPointStuScoreVo>> entry : pointstuscoremap.entrySet()) {
-                    List<PaperPointStuScoreVo> stuscorelist = entry.getValue();
-                    Double stuscore = stuscorelist.stream().mapToDouble(PaperPointStuScoreVo::getStuscore).sum();
-                    stuscore = N_Utils.formatDouble(stuscore, 1);
-
-                    PaperPointStuScoreVo sscorevofirst = stuscorelist.get(0);
-                    PaperPointStuScoreVo sscorevo = new PaperPointStuScoreVo();
-                    sscorevo.setStudentid(sscorevofirst.getStudentid());
-                    sscorevo.setClassid(sscorevofirst.getClassid());
-                    sscorevo.setStuscore(stuscore);
-                    sscorevo.setSchoolid(sscorevofirst.getSchoolid());
-                    pointstuscorelist.add(sscorevo);
+                //先按照班级进行分组，防止一个学生在多个班级收到多份作业
+                Map<Integer,List<PaperPointStuScoreVo>> pointclassscoremap = gradepointstulist.stream().collect(Collectors.groupingBy(PaperPointStuScoreVo::getClassid));
+                for(Map.Entry<Integer, List<PaperPointStuScoreVo>> classEntry : pointclassscoremap.entrySet()){
+                    List<PaperPointStuScoreVo> pointstuscoreList = classEntry.getValue();
+                    Map<Integer, List<PaperPointStuScoreVo>> pointstuscoremap = pointstuscoreList.stream().collect(Collectors.groupingBy(PaperPointStuScoreVo::getStudentid));
+                    for (Map.Entry<Integer, List<PaperPointStuScoreVo>> entry : pointstuscoremap.entrySet()) {
+                        List<PaperPointStuScoreVo> stuscorelist = entry.getValue();
+                        Double stuscore = stuscorelist.stream().mapToDouble(PaperPointStuScoreVo::getStuscore).sum();
+                        stuscore = N_Utils.formatDouble(stuscore, 1);
+
+                        PaperPointStuScoreVo sscorevofirst = stuscorelist.get(0);
+                        PaperPointStuScoreVo sscorevo = new PaperPointStuScoreVo();
+                        sscorevo.setStudentid(sscorevofirst.getStudentid());
+                        sscorevo.setClassid(sscorevofirst.getClassid());
+                        sscorevo.setStuscore(stuscore);
+                        sscorevo.setSchoolid(sscorevofirst.getSchoolid());
+                        pointstuscorelist.add(sscorevo);
+                    }
                 }
 
                 Map<Integer, List<PaperPointStuScoreVo>> schoolStuMap = pointstuscorelist.stream().collect(Collectors.groupingBy(PaperPointStuScoreVo::getSchoolid));