Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/IndexBaseMonthDataServiceImpl.java

@@ -461,86 +461,90 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			organIds = Arrays.stream(organIdsStr.split(",")).map(Integer::new).collect(Collectors.toSet());
 		}
 		Date date = new Date();
-		boolean flag = false;
+		boolean flag1 = false;
 		int countLessThenThreeClassGroupNum = indexBaseMonthDataDao.countLessThenThreeClassGroupNum(organIds);
 		if(countLessThenThreeClassGroupNum > 0){
-			flag = true;
+			flag1 = true;
 		}
-		if(!flag){
+		if(!flag1){
 			List<Long> errInspection = indexBaseMonthDataDao.queryErrInspection(organIds);
 			if(errInspection.size() > 0){
-				flag = true;
+				flag1 = true;
 			}
 		}
+		resultMap.put("musicPatrol",flag1);
+		boolean flag2 = false;
 		Date firstDayOfMonth = DateUtil.getFirstDayOfMonth(DateUtil.addMonths(date, -1));
-		if(!flag){
+		if(!flag2){
 			int countNoPaymentStudentNum = indexBaseMonthDataDao.countNoPaymentStudentNum(organIds);
 			if(countNoPaymentStudentNum > 0){
-				flag = true;
+				flag2 = true;
 			}
 		}
-		if(!flag){
+		if(!flag2){
 			List<Long> quitGroupNum = indexBaseMonthDataDao.queryApplyForQuitGroupNum(organIds);
 			if(quitGroupNum.size() > 0){
-				flag = true;
+				flag2 = true;
 			}
 		}
-		if(!flag){
+		if(!flag2){
 			List<Long> attendanceInfo = indexBaseMonthDataDao.queryStudentAttendanceInfo(organIds, StudentAttendanceStatusEnum.TRUANT.getCode(),firstDayOfMonth);
 			if(attendanceInfo.size() > 0){
-				flag = true;
+				flag2 = true;
 			}
 		}
-		if(!flag){
+		if(!flag2){
 			List<Long> attendanceInfo1 = indexBaseMonthDataDao.queryStudentAttendanceInfo(organIds, StudentAttendanceStatusEnum.LEAVE.getCode(),null);
 			if(attendanceInfo1.size() > 0){
-				flag = true;
+				flag2 = true;
 			}
 		}
-		if(!flag){
+		resultMap.put("studentInfo",flag2);
+		boolean flag3 = false;
+		if(!flag3){
 			List<Long> attendanceError = indexBaseMonthDataDao.getAttendanceError(organIdsStr,firstDayOfMonth);
 			if(attendanceError.size() > 0){
-				flag = true;
+				flag3 = true;
 			}
 		}
-		if(!flag){
+		if(!flag3){
 			List<Long> noAttendance = indexBaseMonthDataDao.getNoAttendance(organIdsStr,firstDayOfMonth);
 			if(noAttendance.size() > 0){
-				flag = true;
+				flag3 = true;
 			}
 		}
-		if(!flag){
+		if(!flag3){
 			List<Long> teacherLeave = indexBaseMonthDataDao.queryTeacherLeave(organIdsStr);
 			if(teacherLeave.size() > 0){
-				flag = true;
+				flag3 = true;
 			}
 		}
-		if(!flag){
+		if(!flag3){
 			String monthStr = DateUtil.format(date, DateUtil.ISO_YEAR_MONTH_FORMAT);
 			List<Long> lowTeacherSalary = indexBaseMonthDataDao.queryLowTeacherSalary(organIdsStr,monthStr);
 			if(lowTeacherSalary.size() > 0){
-				flag = true;
+				flag3 = true;
 			}
 		}
-		if(!flag){
+		if(!flag3){
 			List<Long> inspectionItem = indexBaseMonthDataDao.queryInspectionItem(organIdsStr);
 			if(inspectionItem.size() > 0){
-				flag = true;
+				flag3 = true;
 			}
 		}
-		if(!flag){
+		if(!flag3){
 			List<Long> inspectionItemPlan = indexBaseMonthDataDao.queryInspectionItemPlan(organIdsStr);
 			if(inspectionItemPlan.size() > 0){
-				flag = true;
+				flag3 = true;
 			}
 		}
-		if(!flag){
+		if(!flag3){
 			List<Long> studentVisit = indexBaseMonthDataDao.queryStudentVisit(organIdsStr);
 			if(studentVisit.size() > 0){
-				flag = true;
+				flag3 = true;
 			}
 		}
-		resultMap.put("indexErrData",flag);
+		resultMap.put("teacherInfo",flag3);
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
 			throw new BizException("用户信息获取失败");
@@ -555,7 +559,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		if(musicGroupIds.size() > 0){
 			List<Long> calenderIds = musicGroupPaymentCalenderDao.queryEndIds(configValue1, format,musicGroupIds);
 			if(calenderIds.size() > 0){
-				resultMap.put("indexErrData",true);
+				resultMap.put("remindMatterData",true);
 			}else {
 				resultMap.put("remindMatterData",false);
 			}