Merge remote-tracking branch 'origin/master'

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

@@ -225,13 +225,14 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 			int exercisesMessageNum=0;
 			int exercisesMessageTimelyNum=0;
 			for (ExtracurricularExercisesReply studentExercise : studentExercises) {
-				if(Objects.isNull(studentExercise.getCreateTime())){
+				if(Objects.isNull(studentExercise.getSubmitTime())
+					||Objects.isNull(studentExercise.getCreateTime())){
 					continue;
 				}
-				exercisesMessageNum+=1;
-				if(Objects.isNull(studentExercise.getSubmitTime())){
+				if(studentExercise.getSubmitTime().after(studentExercise.getCreateTime())){
 					continue;
 				}
+				exercisesMessageNum+=1;
 				int hours = DateUtil.hoursBetween(studentExercise.getSubmitTime(), studentExercise.getCreateTime());
 				if(hours<=12){
 					exercisesMessageTimelyNum+=1;