浏览代码

feat:服务指标未完成提醒

Joburgess 4 年之前
父节点
当前提交
605b883ce1

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

@@ -506,6 +506,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			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;

+ 2 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentExtracurricularExercisesSituationServiceImpl.java

@@ -257,7 +257,7 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 		List<CourseSchedule> courseSchedules = courseScheduleDao.findByCourseScheduleIds(new ArrayList<>(courseIds));
 		Set<Long> overCourseIds = courseSchedules.stream().filter(c->CourseStatusEnum.OVER.equals(c.getStatus())).map(CourseSchedule::getId).collect(Collectors.toSet());
 		for (StudentExtracurricularExercisesSituation sees : teacherServeWithDate) {
-			if(sees.getExpectExercisesNum()>=sees.getActualExercisesNum()){
+			if(sees.getActualExercisesNum()>=sees.getExpectExercisesNum()){
 				serveIds.add(sees.getId());
 			}else{
 				if(StringUtils.isBlank(sees.getCourseIds())){
@@ -270,7 +270,7 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 						overCourseNum+=1;
 					}
 				}
-				if(sees.getExpectExercisesNum()>=overCourseNum){
+				if(sees.getActualExercisesNum()>=overCourseNum){
 					serveIds.add(sees.getId());
 				}
 			}