|
@@ -863,14 +863,17 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
|
|
|
fourChild.add(new IndexErrInfoDto(IndexErrorType.CURRENT_COURSE_ERROR, currentCourseError));
|
|
|
});
|
|
|
CompletableFuture future2 = null;
|
|
|
+ CompletableFuture future3 = null;
|
|
|
if(classGroupIds == null || classGroupIds.size() > 0) {
|
|
|
future2 = this.async(() -> {
|
|
|
//课程考勤异常
|
|
|
int teacherAttendanceError = indexBaseMonthDataDao.getTeacherAttendanceError(organIdList, startTime, classGroupIdList, tenantId);
|
|
|
int studentAttendanceError = indexBaseMonthDataDao.getStudentAttendanceError(organIdList, startTime, classGroupIdList, tenantId);
|
|
|
- int noAttendance = indexBaseMonthDataDao.getNoAttendance(organIdList, startTime, classGroupIdList, tenantId);
|
|
|
fourChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_EXCEPTION_ATTENDANCE, teacherAttendanceError));
|
|
|
fourChild.add(new IndexErrInfoDto(IndexErrorType.STUDENT_EXCEPTION_ATTENDANCE, studentAttendanceError));
|
|
|
+ });
|
|
|
+ future3 = this.async(() -> {
|
|
|
+ int noAttendance = indexBaseMonthDataDao.getNoAttendance(organIdList, startTime, classGroupIdList, tenantId);
|
|
|
//课程异常
|
|
|
fourChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_NOT_A_CLASS, noAttendance));
|
|
|
});
|
|
@@ -881,7 +884,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
|
|
|
fourChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_NOT_A_CLASS, 0));
|
|
|
}
|
|
|
if(classGroupIds == null || classGroupIds.size() > 0) {
|
|
|
- future2.join();
|
|
|
+ future2.join();future3.join();
|
|
|
}
|
|
|
future1.join();
|
|
|
four.setNum(fourChild.stream().mapToInt(IndexErrInfoDto::getNum).sum());
|