|
@@ -516,8 +516,8 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
|
|
|
two.setErrorType(IndexErrorType.STUDENT_INFO);
|
|
|
two.setDesc(IndexErrorType.STUDENT_INFO.getMsg());
|
|
|
List<IndexErrInfoDto> twoChild = new ArrayList<>();
|
|
|
- //学员请假异常提醒(获取前两个月的)
|
|
|
- String format1 = DateUtil.format(DateUtil.addMonths(new Date(), -1), DateUtil.ISO_YEAR_MONTH_FORMAT);
|
|
|
+ //学员请假异常提醒(只提醒本月的异常)
|
|
|
+ String format1 = DateUtil.format(new Date(), DateUtil.ISO_YEAR_MONTH_FORMAT);
|
|
|
twoChild.add(new IndexErrInfoDto(IndexErrorType.STUDENT_ERROR_LEAVE, IndexErrorType.STUDENT_ERROR_LEAVE.getMsg(), indexBaseMonthDataDao.countStudentErrorLeave(organIds,format1,classGroupIds), null));
|
|
|
|
|
|
//未缴费学员数
|
|
@@ -934,7 +934,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
|
|
|
boolean flag2 = false;
|
|
|
if(!flag2){
|
|
|
//学员请假异常提醒(获取前两个月的)
|
|
|
- String format1 = DateUtil.format(DateUtil.addMonths(date, -1), DateUtil.ISO_YEAR_MONTH_FORMAT);
|
|
|
+ String format1 = DateUtil.format(date, DateUtil.ISO_YEAR_MONTH_FORMAT);
|
|
|
int studentErrorLeaveNum = indexBaseMonthDataDao.countStudentErrorLeave(organIds,format1,classGroupIds);
|
|
|
if(studentErrorLeaveNum > 0){
|
|
|
flag2 = true;
|