Parcourir la source

评价模块调整

dzx il y a 1 an
Parent
commit
66951144c1

+ 3 - 2
src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentAssessmentInspectionServiceImpl.java

@@ -537,6 +537,7 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
 
                 if(classEvaluateMap.containsKey(classId)){
                     Map<Long, List<TeaEvaluateClassListVo>> evaluateCategoryMap = classEvaluateMap.get(classId).stream().collect(Collectors.groupingBy(TeaEvaluateClassListVo::getId));
+                    int size = evaluateCategoryMap.size();
                     List<Double> evaluateSocreList = new ArrayList<>();//存每个项的平均分
                     for (Long id : evaluateCategoryMap.keySet()) {
                         List<TeaEvaluateClassListVo> resultList = evaluateCategoryMap.get(id);
@@ -544,8 +545,8 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
                         double avgScore = BigDecimal.valueOf(allSorce).divide(BigDecimal.valueOf(resultList.size())).setScale(2, RoundingMode.HALF_UP).doubleValue();
                         evaluateSocreList.add(avgScore);
                     }
-
-                    double jskhValue = evaluateSocreList.stream().mapToDouble(Double::doubleValue).sum();
+                    double sum = evaluateSocreList.stream().mapToDouble(Double::doubleValue).sum();
+                    double jskhValue = BigDecimal.valueOf(sum).divide(BigDecimal.valueOf(size),2, RoundingMode.HALF_UP).doubleValue();
                     c.setTeacherAssessComprehensiveIndex(jskhValue);
                     String replacedExpression = jskhFormula.replace("JSKH", Double.toString(jskhValue));