|
|
|
@ -471,7 +471,7 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
|
|
|
|
|
studentHandsOnTaskVideoQuery.setHandsOnId(handsOnId);
|
|
|
|
|
List<StudentHandsOnTaskVideo> valuesByQuery = studentHandsOnTaskVideoService.getValuesByQuery(studentHandsOnTaskVideoQuery);
|
|
|
|
|
double sum = valuesByQuery.stream().mapToDouble(v -> v.getVideoScore() == null ? 0 : v.getVideoScore().doubleValue()).sum();
|
|
|
|
|
student.set("sumScore", sum);
|
|
|
|
|
student.set("sumScore", ObjectUtil.isEmpty(valuesByQuery) ? "-" : sum);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (HandsOnTaskEnum.TASK_PPT.status.equals(studentScoreParam.getType())) {
|
|
|
|
@ -481,7 +481,7 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
|
|
|
|
|
studentHandsOnTaskPptQuery.setHandsOnId(handsOnId);
|
|
|
|
|
List<StudentHandsOnTaskPpt> valuesByQuery = studentHandsOnTaskPptService.getValuesByQuery(studentHandsOnTaskPptQuery);
|
|
|
|
|
double sum = valuesByQuery.stream().mapToDouble(v -> v.getPptScore() == null ? 0 : v.getPptScore().doubleValue()).sum();
|
|
|
|
|
student.set("sumScore", sum);
|
|
|
|
|
student.set("sumScore",ObjectUtil.isEmpty(valuesByQuery) ? "-" : sum);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (HandsOnTaskEnum.TASK_THEORY.status.equals(studentScoreParam.getType())) {
|
|
|
|
@ -491,7 +491,7 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
|
|
|
|
|
studentHandsOnTaskTheoryQuery.setHandsOnId(handsOnId);
|
|
|
|
|
List<StudentHandsOnTaskTheory> valuesByQuery = studentHandsOnTaskTheoryService.getValuesByQuery(studentHandsOnTaskTheoryQuery);
|
|
|
|
|
double sum = valuesByQuery.stream().mapToDouble(v -> v.getTheoryScore() == null ? 0 : v.getTheoryScore().doubleValue()).sum();
|
|
|
|
|
student.set("sumScore", sum);
|
|
|
|
|
student.set("sumScore", ObjectUtil.isEmpty(valuesByQuery) ? "-" : sum);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (HandsOnTaskEnum.TASK_PRACTICAL_TRAINING.status.equals(studentScoreParam.getType())) {
|
|
|
|
@ -501,7 +501,7 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
|
|
|
|
|
studentHandsOnTaskStepQuery.setHandsOnId(handsOnId);
|
|
|
|
|
List<StudentHandsOnTaskStep> valuesByQuery = studentHandsOnTaskStepService.getValuesByQuery(studentHandsOnTaskStepQuery);
|
|
|
|
|
double sum = valuesByQuery.stream().mapToDouble(v -> v.getTheoryScore() == null ? 0 : v.getTheoryScore().doubleValue()).sum();
|
|
|
|
|
student.set("sumScore", sum);
|
|
|
|
|
student.set("sumScore", ObjectUtil.isEmpty(valuesByQuery) ? "-" : sum);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (HandsOnTaskEnum.TASK_REPORT_WRITING.status.equals(studentScoreParam.getType())) {
|
|
|
|
@ -511,7 +511,7 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
|
|
|
|
|
studentHandsOnTaskReportQuery.setHandsOnId(handsOnId);
|
|
|
|
|
List<StudentHandsOnTaskReport> valuesByQuery = studentHandsOnTaskReportService.getValuesByQuery(studentHandsOnTaskReportQuery);
|
|
|
|
|
double sum = valuesByQuery.stream().mapToDouble(v -> v.getReportScore() == null ? 0 : v.getReportScore().doubleValue()).sum();
|
|
|
|
|
student.set("sumScore", sum);
|
|
|
|
|
student.set("sumScore", ObjectUtil.isEmpty(valuesByQuery) ? "-" : sum);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if ("ALL".equals(studentScoreParam.getType())) {
|
|
|
|
@ -521,7 +521,7 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
|
|
|
|
|
handsOnAchievement.setHandOnId(handsOnId);
|
|
|
|
|
handsOnAchievement.setHandOnAchievementStatus(1);
|
|
|
|
|
HandsOnAchievement res = studentHandsOnTaskReportService.queryObject(handsOnAchievement);
|
|
|
|
|
String totalScore = ObjectUtil.isNull(res)? "0" : res.getTotalScore();
|
|
|
|
|
String totalScore = ObjectUtil.isNull(res)? "-" : res.getTotalScore();
|
|
|
|
|
student.set("sumScore", totalScore);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|