|
@@ -566,6 +566,9 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
|
|
|
idSubjectMap = subjects.stream().collect(Collectors.toMap(Subject::getId, s -> s, (s1, s2) -> s1));
|
|
|
}
|
|
|
|
|
|
+ BigDecimal oneHundred = new BigDecimal(100);
|
|
|
+ BigDecimal zero = new BigDecimal("0.00");
|
|
|
+
|
|
|
List<EduHomeworkCardDto> courseHomeworkStudentNumList = studentCourseHomeworkDao.countHomeworkSubjectStudentInfoWithMusicGroup(queryInfo.getGroupId(), queryInfo.getStartTime(), queryInfo.getEndTime());
|
|
|
List<EduHomeworkCardDto> homeworkStudentNumList = extracurricularExercisesReplyDao.countEduHomeworkSubjectStudentNumWithMusicGroup(queryInfo.getGroupId(), queryInfo.getStartTime(), queryInfo.getEndTime());
|
|
|
homeworkStudentNumList.addAll(courseHomeworkStudentNumList);
|
|
@@ -594,9 +597,9 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
|
|
|
ehs.setExceptStudentNum(exceptStudentNum);
|
|
|
ehs.setSubmitStudentNum(submitStudentNum);
|
|
|
if(exceptStudentNum<=0){
|
|
|
- ehs.setSubmitRate(BigDecimal.ZERO);
|
|
|
+ ehs.setSubmitRate(zero);
|
|
|
}else{
|
|
|
- ehs.setSubmitRate(new BigDecimal(submitStudentNum).divide(new BigDecimal(exceptStudentNum), CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP));
|
|
|
+ ehs.setSubmitRate(new BigDecimal(submitStudentNum).divide(new BigDecimal(exceptStudentNum), CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP).multiply(oneHundred));
|
|
|
}
|
|
|
dataList.add(ehs);
|
|
|
}
|