|
|
@ -37,6 +37,7 @@ import org.springframework.validation.annotation.Validated;
|
|
|
|
import javax.annotation.Nullable;
|
|
|
|
import javax.annotation.Nullable;
|
|
|
|
import javax.validation.constraints.NotNull;
|
|
|
|
import javax.validation.constraints.NotNull;
|
|
|
|
import java.math.BigDecimal;
|
|
|
|
import java.math.BigDecimal;
|
|
|
|
|
|
|
|
import java.math.RoundingMode;
|
|
|
|
import java.util.*;
|
|
|
|
import java.util.*;
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
|
@ -443,11 +444,11 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
|
|
|
|
Double theoryAvgScore = achievementList.stream().map(e -> ObjectUtil.defaultIfNull(e.getTheoryScore(), "0")).collect(Collectors.averagingDouble(Double::parseDouble));
|
|
|
|
Double theoryAvgScore = achievementList.stream().map(e -> ObjectUtil.defaultIfNull(e.getTheoryScore(), "0")).collect(Collectors.averagingDouble(Double::parseDouble));
|
|
|
|
Double stepAvgScore = achievementList.stream().map(e -> ObjectUtil.defaultIfNull(e.getPracticalTrainingScore(), "0")).collect(Collectors.averagingDouble(Double::parseDouble));
|
|
|
|
Double stepAvgScore = achievementList.stream().map(e -> ObjectUtil.defaultIfNull(e.getPracticalTrainingScore(), "0")).collect(Collectors.averagingDouble(Double::parseDouble));
|
|
|
|
Double reportAvgScore = achievementList.stream().map(e -> ObjectUtil.defaultIfNull(e.getReportWritingScore(), "0")).collect(Collectors.averagingDouble(Double::parseDouble));
|
|
|
|
Double reportAvgScore = achievementList.stream().map(e -> ObjectUtil.defaultIfNull(e.getReportWritingScore(), "0")).collect(Collectors.averagingDouble(Double::parseDouble));
|
|
|
|
teacherOpenCourseHandsOnList.setVideoAvgScore(videoScore);
|
|
|
|
teacherOpenCourseHandsOnList.setVideoAvgScore(ObjectUtil.isEmpty(videoScore) ? 0 : new BigDecimal(videoScore).setScale(2, RoundingMode.UP).doubleValue());
|
|
|
|
teacherOpenCourseHandsOnList.setPptAvgScore(pptAvgScore);
|
|
|
|
teacherOpenCourseHandsOnList.setPptAvgScore(ObjectUtil.isEmpty(pptAvgScore) ? 0 : new BigDecimal(pptAvgScore).setScale(2, RoundingMode.UP).doubleValue());
|
|
|
|
teacherOpenCourseHandsOnList.setTheoryAvgScore(theoryAvgScore);
|
|
|
|
teacherOpenCourseHandsOnList.setTheoryAvgScore(ObjectUtil.isEmpty(theoryAvgScore) ? 0 : new BigDecimal(theoryAvgScore).setScale(2, RoundingMode.UP).doubleValue());
|
|
|
|
teacherOpenCourseHandsOnList.setStepAvgScore(stepAvgScore);
|
|
|
|
teacherOpenCourseHandsOnList.setStepAvgScore(ObjectUtil.isEmpty(stepAvgScore) ? 0 : new BigDecimal(stepAvgScore).setScale(2, RoundingMode.UP).doubleValue());
|
|
|
|
teacherOpenCourseHandsOnList.setReportAvgScore(reportAvgScore);
|
|
|
|
teacherOpenCourseHandsOnList.setReportAvgScore(ObjectUtil.isEmpty(reportAvgScore) ? 0 : new BigDecimal(reportAvgScore).setScale(2, RoundingMode.UP).doubleValue());
|
|
|
|
return teacherOpenCourseHandsOnList;
|
|
|
|
return teacherOpenCourseHandsOnList;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|