|
@@ -294,6 +294,11 @@ public class StudentServeServiceImpl implements StudentServeService {
|
|
|
public void exercisesSituationStatistics2(String monday, List<Integer> studentIds) {
|
|
|
LocalDate nowDate = LocalDateTime.now(DateUtil.zoneId).toLocalDate();
|
|
|
|
|
|
+ int lastWeekTodayUpdateNum = studentExtracurricularExercisesSituationDao.findLastWeekTodayUpdateNum(nowDate.plusDays(-nowDate.getDayOfWeek().getValue()).toString());
|
|
|
+ if(lastWeekTodayUpdateNum<=0){
|
|
|
+ nowDate = nowDate.plusDays(-nowDate.getDayOfWeek().getValue());
|
|
|
+ }
|
|
|
+
|
|
|
if(StringUtils.isNotBlank(monday)){
|
|
|
nowDate=LocalDate.parse(monday, DateUtil.dateFormatter);
|
|
|
}
|
|
@@ -608,9 +613,9 @@ public class StudentServeServiceImpl implements StudentServeService {
|
|
|
|
|
|
@Override
|
|
|
public void updateExercisesSituation(Date date,List<Integer> studentIds, Integer teacherId) {
|
|
|
- if(true){
|
|
|
- return;
|
|
|
- }
|
|
|
+// if(true){
|
|
|
+// return;
|
|
|
+// }
|
|
|
LocalDate nowDate = LocalDateTime.ofInstant(date.toInstant(), DateUtil.zoneId).toLocalDate();
|
|
|
if(Objects.isNull(date)){
|
|
|
nowDate = LocalDateTime.now(DateUtil.zoneId).toLocalDate();
|