Merge remote-tracking branch 'origin/master'

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

@@ -212,9 +212,8 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 				results.add(studentExtracurricularExercisesSituation);
 				continue;
 			}
-			long exercisesNum = studentExercises.stream().map(ExtracurricularExercisesReply::getUserId).distinct().count();
 			studentExtracurricularExercisesSituation.setActualExercisesNum(1);
-			long replyNum = studentExercises.stream().filter(e -> StringUtils.isNotBlank(e.getAttachments())).count();
+			long replyNum = studentExercises.stream().filter(e -> e.getStatus()==1).count();
 			studentExtracurricularExercisesSituation.setExercisesReplyNum(replyNum>0?1:0);
 			int exercisesMessageNum=0;
 			int exercisesMessageTimelyNum=0;