|
@@ -127,7 +127,30 @@ public class StudentServeServiceImpl implements StudentServeService {
|
|
|
|
|
|
if (!CollectionUtils.isEmpty(allServeStudentIds)){
|
|
|
List<StudentServeCourseHomeworkDto> studentHomeworks = studentCourseHomeworkDao.findStudentHomeworkWithCourseDateRange(monDayDate.toString(), sunDayDate.toString(), new ArrayList<>(allServeStudentIds));
|
|
|
- studentHomeworkMap = studentHomeworks.stream().filter(h -> DateUtil.daysBetween(h.getCourseStartTime(), h.getHomeworkCreateTime())<3).collect(Collectors.groupingBy(StudentServeCourseHomeworkDto::getUserId));
|
|
|
+ List<StudentServeCourseHomeworkDto> studentHomeworksTmp =new ArrayList<>();
|
|
|
+ for (StudentServeCourseHomeworkDto studentHomework : studentHomeworks) {
|
|
|
+ LocalDate courseStartLocalDate = LocalDateTime.ofInstant(studentHomework.getCourseStartTime().toInstant(), DateUtil.zoneId).toLocalDate();
|
|
|
+ switch (courseStartLocalDate.getDayOfWeek()){
|
|
|
+ case SATURDAY:
|
|
|
+ if(DateUtil.daysBetween(studentHomework.getCourseStartTime(), studentHomework.getHomeworkCreateTime())<4){
|
|
|
+ studentHomeworksTmp.add(studentHomework);
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ case SUNDAY:
|
|
|
+ if(DateUtil.daysBetween(studentHomework.getCourseStartTime(), studentHomework.getHomeworkCreateTime())<3){
|
|
|
+ studentHomeworksTmp.add(studentHomework);
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ LocalDate homeworkCreateTime = LocalDateTime.ofInstant(studentHomework.getHomeworkCreateTime().toInstant(), DateUtil.zoneId).toLocalDate();
|
|
|
+ if(courseStartLocalDate.get(DateUtil.weekFields.weekOfYear())==homeworkCreateTime.get(DateUtil.weekFields.weekOfYear())){
|
|
|
+ studentHomeworksTmp.add(studentHomework);
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ studentHomeworkMap = studentHomeworksTmp.stream()
|
|
|
+ .collect(Collectors.groupingBy(StudentServeCourseHomeworkDto::getUserId));
|
|
|
}
|
|
|
|
|
|
if(!CollectionUtils.isEmpty(allServeStudentIds)){
|