Przeglądaj źródła

feat:服务指标未完成提醒

Joburgess 4 lat temu
rodzic
commit
4b0d235f10

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

@@ -362,17 +362,17 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			int noAttendance = indexBaseMonthDataDao.getNoAttendance(organIds,startTime);
 			fourChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_NOT_A_CLASS, IndexErrorType.TEACHER_NOT_A_CLASS.getMsg(), noAttendance, null));
 
-			Map<String, Object> params = new HashMap<>();
-			LocalDate nowDate = LocalDateTime.now(DateUtil.zoneId).toLocalDate();
-			LocalDate monDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
-			LocalDate sunDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.SUNDAY.getValue());
-			params.put("organIds", organIds);
-			params.put("monday",monDayDate.toString());
-			params.put("sunday",sunDayDate.toString());
-			params.put("unDone",1);
-			params.put("rightServeIds", studentExtracurricularExercisesSituationService.findTeacherRightServeIds(monDayDate.toString(), sunDayDate.toString()));
-			int serveErrTeacherNum = studentExtracurricularExercisesSituationDao.countTeacherServeInfo(params);
-			fourChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_SERVE_ERROR, IndexErrorType.TEACHER_SERVE_ERROR.getMsg(), serveErrTeacherNum, null));
+//			Map<String, Object> params = new HashMap<>();
+//			LocalDate nowDate = LocalDateTime.now(DateUtil.zoneId).toLocalDate();
+//			LocalDate monDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
+//			LocalDate sunDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.SUNDAY.getValue());
+//			params.put("organIds", organIds);
+//			params.put("monday",monDayDate.toString());
+//			params.put("sunday",sunDayDate.toString());
+//			params.put("unDone",1);
+//			params.put("rightServeIds", studentExtracurricularExercisesSituationService.findTeacherRightServeIds(monDayDate.toString(), sunDayDate.toString()));
+//			int serveErrTeacherNum = studentExtracurricularExercisesSituationDao.countTeacherServeInfo(params);
+//			fourChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_SERVE_ERROR, IndexErrorType.TEACHER_SERVE_ERROR.getMsg(), serveErrTeacherNum, null));
 
 			four.setNum(fourChild.stream().mapToInt(IndexErrInfoDto::getNum).sum());
 			four.setResult(fourChild);
@@ -497,21 +497,21 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 				flag4 = true;
 			}
 		}
-		if(!flag4){
-			Map<String, Object> params = new HashMap<>();
-			LocalDate nowDate = LocalDateTime.now(DateUtil.zoneId).toLocalDate();
-			LocalDate monDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
-			LocalDate sunDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.SUNDAY.getValue());
-			params.put("organIds", organIds);
-			params.put("monday",monDayDate.toString());
-			params.put("sunday",sunDayDate.toString());
-			params.put("unDone",1);
-			params.put("rightServeIds", studentExtracurricularExercisesSituationService.findTeacherRightServeIds(monDayDate.toString(), sunDayDate.toString()));
-			int serveErrTeacherNum = studentExtracurricularExercisesSituationDao.countTeacherServeInfo(params);
-			if(serveErrTeacherNum > 0){
-				flag4 = true;
-			}
-		}
+//		if(!flag4){
+//			Map<String, Object> params = new HashMap<>();
+//			LocalDate nowDate = LocalDateTime.now(DateUtil.zoneId).toLocalDate();
+//			LocalDate monDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
+//			LocalDate sunDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.SUNDAY.getValue());
+//			params.put("organIds", organIds);
+//			params.put("monday",monDayDate.toString());
+//			params.put("sunday",sunDayDate.toString());
+//			params.put("unDone",1);
+//			params.put("rightServeIds", studentExtracurricularExercisesSituationService.findTeacherRightServeIds(monDayDate.toString(), sunDayDate.toString()));
+//			int serveErrTeacherNum = studentExtracurricularExercisesSituationDao.countTeacherServeInfo(params);
+//			if(serveErrTeacherNum > 0){
+//				flag4 = true;
+//			}
+//		}
 		resultMap.put("attendanceServe",flag4);
 
 		SysUser sysUser = sysUserFeignService.queryUserInfo();