|
@@ -376,10 +376,10 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
|
|
|
twoChild.add(new IndexErrInfoDto(IndexErrorType.STUDENT_NOT_PAYMENT, IndexErrorType.STUDENT_NOT_PAYMENT.getMsg(), indexBaseMonthDataDao.countNoPaymentStudentNum(organIds), indexBaseMonthDataDao.getNoPaymentMusicGroup(organIds)));
|
|
|
List<Long> quitGroupNum = indexBaseMonthDataDao.queryApplyForQuitGroupNum(organIds);
|
|
|
twoChild.add(new IndexErrInfoDto(IndexErrorType.STUDENT_APPLY_FOR_QUIT_MUSIC_GROUP, IndexErrorType.STUDENT_APPLY_FOR_QUIT_MUSIC_GROUP.getMsg(), quitGroupNum.size(), quitGroupNum));
|
|
|
- List<Long> attendanceInfo = indexBaseMonthDataDao.queryStudentAttendanceInfo(organIds, StudentAttendanceStatusEnum.TRUANT.getCode(),startTime);
|
|
|
- twoChild.add(new IndexErrInfoDto(IndexErrorType.COURSE_TRUANT_STUDENT_NUM, IndexErrorType.COURSE_TRUANT_STUDENT_NUM.getMsg(), attendanceInfo.size(), null));
|
|
|
- List<Long> attendanceInfo1 = indexBaseMonthDataDao.queryStudentAttendanceInfo(organIds, StudentAttendanceStatusEnum.LEAVE.getCode(),startTime);
|
|
|
- twoChild.add(new IndexErrInfoDto(IndexErrorType.COURSE_LEAVE_STUDENT_NUM, IndexErrorType.COURSE_LEAVE_STUDENT_NUM.getMsg(), attendanceInfo1.size(), null));
|
|
|
+ int attendanceInfo = indexBaseMonthDataDao.queryStudentAttendanceInfo(organIds, StudentAttendanceStatusEnum.TRUANT.getCode(),startTime);
|
|
|
+ twoChild.add(new IndexErrInfoDto(IndexErrorType.COURSE_TRUANT_STUDENT_NUM, IndexErrorType.COURSE_TRUANT_STUDENT_NUM.getMsg(), attendanceInfo, null));
|
|
|
+ int attendanceInfo1 = indexBaseMonthDataDao.queryStudentAttendanceInfo(organIds, StudentAttendanceStatusEnum.LEAVE.getCode(),startTime);
|
|
|
+ twoChild.add(new IndexErrInfoDto(IndexErrorType.COURSE_LEAVE_STUDENT_NUM, IndexErrorType.COURSE_LEAVE_STUDENT_NUM.getMsg(), attendanceInfo1, null));
|
|
|
two.setNum(twoChild.stream().mapToInt(IndexErrInfoDto::getNum).sum());
|
|
|
two.setResult(twoChild);
|
|
|
all.add(two);
|
|
@@ -391,19 +391,19 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
|
|
|
three.setDesc(IndexErrorType.TEACHER_INFO.getMsg());
|
|
|
List<IndexErrInfoDto> threeChild = new ArrayList<>();
|
|
|
|
|
|
- List<Long> attendanceError = indexBaseMonthDataDao.getAttendanceError(organIdsStr,startTime);
|
|
|
- threeChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_EXCEPTION_ATTENDANCE, IndexErrorType.TEACHER_EXCEPTION_ATTENDANCE.getMsg(), attendanceError.size(), attendanceError));
|
|
|
+ int attendanceError = indexBaseMonthDataDao.getAttendanceError(organIdsStr,startTime);
|
|
|
+ threeChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_EXCEPTION_ATTENDANCE, IndexErrorType.TEACHER_EXCEPTION_ATTENDANCE.getMsg(), attendanceError, null));
|
|
|
|
|
|
- List<Long> noAttendance = indexBaseMonthDataDao.getNoAttendance(organIdsStr,startTime);
|
|
|
- threeChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_NOT_A_CLASS, IndexErrorType.TEACHER_NOT_A_CLASS.getMsg(), noAttendance.size(), noAttendance));
|
|
|
+ int noAttendance = indexBaseMonthDataDao.getNoAttendance(organIdsStr,startTime);
|
|
|
+ threeChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_NOT_A_CLASS, IndexErrorType.TEACHER_NOT_A_CLASS.getMsg(), noAttendance, null));
|
|
|
|
|
|
- List<Long> teacherLeave = indexBaseMonthDataDao.queryTeacherLeave(organIdsStr,startTime);
|
|
|
- threeChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_LEAVE, IndexErrorType.TEACHER_LEAVE.getMsg(),teacherLeave.size(), teacherLeave));
|
|
|
+ int teacherLeave = indexBaseMonthDataDao.queryTeacherLeave(organIdsStr,startTime);
|
|
|
+ threeChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_LEAVE, IndexErrorType.TEACHER_LEAVE.getMsg(),teacherLeave, null));
|
|
|
|
|
|
String monthStr = DateUtil.format(date, DateUtil.ISO_YEAR_MONTH_FORMAT);
|
|
|
//全职未离职老师
|
|
|
- List<Long> lowTeacherSalary = indexBaseMonthDataDao.queryLowTeacherSalary(organIdsStr,monthStr);
|
|
|
- threeChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_EXPECT_SALARY_BE_LOW, IndexErrorType.TEACHER_EXPECT_SALARY_BE_LOW.getMsg(),lowTeacherSalary.size(), lowTeacherSalary));
|
|
|
+ int lowTeacherSalary = indexBaseMonthDataDao.queryLowTeacherSalary(organIdsStr,monthStr);
|
|
|
+ threeChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_EXPECT_SALARY_BE_LOW, IndexErrorType.TEACHER_EXPECT_SALARY_BE_LOW.getMsg(),lowTeacherSalary, null));
|
|
|
|
|
|
List<Long> inspectionItem = indexBaseMonthDataDao.queryInspectionItem(organIdsStr);
|
|
|
threeChild.add(new IndexErrInfoDto(IndexErrorType.INSPECTION_ITEM, IndexErrorType.INSPECTION_ITEM.getMsg(),inspectionItem.size(), inspectionItem));
|
|
@@ -489,41 +489,41 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
|
|
|
}
|
|
|
}
|
|
|
if(!flag2){
|
|
|
- List<Long> attendanceInfo = indexBaseMonthDataDao.queryStudentAttendanceInfo(organIds, StudentAttendanceStatusEnum.TRUANT.getCode(),startTime);
|
|
|
- if(attendanceInfo.size() > 0){
|
|
|
+ int attendanceInfo = indexBaseMonthDataDao.queryStudentAttendanceInfo(organIds, StudentAttendanceStatusEnum.TRUANT.getCode(),startTime);
|
|
|
+ if(attendanceInfo > 0){
|
|
|
flag2 = true;
|
|
|
}
|
|
|
}
|
|
|
if(!flag2){
|
|
|
- List<Long> attendanceInfo1 = indexBaseMonthDataDao.queryStudentAttendanceInfo(organIds, StudentAttendanceStatusEnum.LEAVE.getCode(),startTime);
|
|
|
- if(attendanceInfo1.size() > 0){
|
|
|
+ int attendanceInfo1 = indexBaseMonthDataDao.queryStudentAttendanceInfo(organIds, StudentAttendanceStatusEnum.LEAVE.getCode(),startTime);
|
|
|
+ if(attendanceInfo1 > 0){
|
|
|
flag2 = true;
|
|
|
}
|
|
|
}
|
|
|
resultMap.put("studentInfo",flag2);
|
|
|
boolean flag3 = false;
|
|
|
if(!flag3){
|
|
|
- List<Long> attendanceError = indexBaseMonthDataDao.getAttendanceError(organIdsStr,startTime);
|
|
|
- if(attendanceError.size() > 0){
|
|
|
+ int attendanceError = indexBaseMonthDataDao.getAttendanceError(organIdsStr,startTime);
|
|
|
+ if(attendanceError > 0){
|
|
|
flag3 = true;
|
|
|
}
|
|
|
}
|
|
|
if(!flag3){
|
|
|
- List<Long> noAttendance = indexBaseMonthDataDao.getNoAttendance(organIdsStr,startTime);
|
|
|
- if(noAttendance.size() > 0){
|
|
|
+ int noAttendance = indexBaseMonthDataDao.getNoAttendance(organIdsStr,startTime);
|
|
|
+ if(noAttendance > 0){
|
|
|
flag3 = true;
|
|
|
}
|
|
|
}
|
|
|
if(!flag3){
|
|
|
- List<Long> teacherLeave = indexBaseMonthDataDao.queryTeacherLeave(organIdsStr,startTime);
|
|
|
- if(teacherLeave.size() > 0){
|
|
|
+ int teacherLeave = indexBaseMonthDataDao.queryTeacherLeave(organIdsStr,startTime);
|
|
|
+ if(teacherLeave > 0){
|
|
|
flag3 = true;
|
|
|
}
|
|
|
}
|
|
|
if(!flag3){
|
|
|
String monthStr = DateUtil.format(date, DateUtil.ISO_YEAR_MONTH_FORMAT);
|
|
|
- List<Long> lowTeacherSalary = indexBaseMonthDataDao.queryLowTeacherSalary(organIdsStr,monthStr);
|
|
|
- if(lowTeacherSalary.size() > 0){
|
|
|
+ int lowTeacherSalary = indexBaseMonthDataDao.queryLowTeacherSalary(organIdsStr,monthStr);
|
|
|
+ if(lowTeacherSalary > 0){
|
|
|
flag3 = true;
|
|
|
}
|
|
|
}
|