|
@@ -140,7 +140,8 @@ public class StudentServeServiceImpl implements StudentServeService {
|
|
|
studentExtracurricularExercisesSituation.setActualExercisesNum(1);
|
|
|
long replyNum = studentHomeworks.stream().filter(e -> YesOrNoEnum.YES.equals(e.getStatus())).count();
|
|
|
studentExtracurricularExercisesSituation.setExercisesReplyNum(replyNum>0?1:0);
|
|
|
- if(replyNum>0){
|
|
|
+ long haveSubmitTimes = studentHomeworks.stream().filter(e -> Objects.nonNull(e.getSubmitTime())).count();
|
|
|
+ if(replyNum>0&&haveSubmitTimes>0){
|
|
|
Date lastSubmitTime = studentHomeworks.stream().filter(e->Objects.nonNull(e.getSubmitTime())).max(Comparator.comparing(StudentServeCourseHomeworkDto::getSubmitTime)).get().getSubmitTime();
|
|
|
studentExtracurricularExercisesSituation.setLastSubmitTime(lastSubmitTime);
|
|
|
}
|
|
@@ -178,7 +179,8 @@ public class StudentServeServiceImpl implements StudentServeService {
|
|
|
studentExtracurricularExercisesSituation.setActualExercisesNum(1);
|
|
|
long replyNum = studentExercises.stream().filter(e -> e.getStatus()==1).count();
|
|
|
studentExtracurricularExercisesSituation.setExercisesReplyNum(replyNum>0?1:0);
|
|
|
- if(replyNum>0){
|
|
|
+ long haveSubmitTimes = studentExercises.stream().filter(e->Objects.nonNull(e.getSubmitTime())).count();
|
|
|
+ if(replyNum>0&&haveSubmitTimes>0){
|
|
|
Date lastSubmitTime = studentExercises.stream().filter(e->Objects.nonNull(e.getSubmitTime())).max(Comparator.comparing(ExtracurricularExercisesReply::getSubmitTime)).get().getSubmitTime();
|
|
|
studentExtracurricularExercisesSituation.setLastSubmitTime(lastSubmitTime);
|
|
|
}
|