|
@@ -213,9 +213,9 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
|
|
|
continue;
|
|
|
}
|
|
|
long exercisesNum = studentExercises.stream().map(ExtracurricularExercisesReply::getUserId).distinct().count();
|
|
|
- studentExtracurricularExercisesSituation.setActualExercisesNum(Integer.valueOf(Long.valueOf(exercisesNum).toString()));
|
|
|
+ studentExtracurricularExercisesSituation.setActualExercisesNum(1);
|
|
|
long replyNum = studentExercises.stream().filter(e -> StringUtils.isNotBlank(e.getAttachments())).count();
|
|
|
- studentExtracurricularExercisesSituation.setExercisesReplyNum(Integer.valueOf(Long.valueOf(replyNum).toString()));
|
|
|
+ studentExtracurricularExercisesSituation.setExercisesReplyNum(replyNum>0?1:0);
|
|
|
int exercisesMessageNum=0;
|
|
|
int exercisesMessageTimelyNum=0;
|
|
|
for (ExtracurricularExercisesReply studentExercise : studentExercises) {
|
|
@@ -231,8 +231,8 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
|
|
|
exercisesMessageTimelyNum+=1;
|
|
|
}
|
|
|
}
|
|
|
- studentExtracurricularExercisesSituation.setExercisesMessageNum(exercisesMessageNum);
|
|
|
- studentExtracurricularExercisesSituation.setExercisesMessageTimelyNum(exercisesMessageTimelyNum);
|
|
|
+ studentExtracurricularExercisesSituation.setExercisesMessageNum(exercisesMessageNum>0?1:0);
|
|
|
+ studentExtracurricularExercisesSituation.setExercisesMessageTimelyNum(exercisesMessageTimelyNum>0?1:0);
|
|
|
results.add(studentExtracurricularExercisesSituation);
|
|
|
}
|
|
|
studentExtracurricularExercisesSituationDao.deleteByMonday(monDayDate.toString());
|