Merge branch 'online1' of http://git.dayaedu.com/yonge/mec into online1

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

@@ -285,6 +285,14 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 	@Transactional(rollbackFor = Exception.class)
 	public void exercisesSituationStatistics2(String monday) {
 		LocalDate nowDate = LocalDateTime.now(DateUtil.zoneId).toLocalDate();
+
+		if(nowDate.getDayOfWeek()==DayOfWeek.MONDAY){
+			int lastWeekTodayUpdateNum = studentExtracurricularExercisesSituationDao.findLastWeekTodayUpdateNum(nowDate.toString());
+			if(lastWeekTodayUpdateNum<=0){
+				nowDate = nowDate.plusDays(-1);
+			}
+		}
+
 		if(StringUtils.isNotBlank(monday)){
 			nowDate=LocalDate.parse(monday, DateUtil.dateFormatter);
 		}