Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -60,9 +60,11 @@ public class ExtracurricularExercisesMessageServiceImpl extends BaseServiceImpl<
 			throw new BizException("课外训练不存在");
 		}
 		ExtracurricularExercises extracurricularExercises = extracurricularExercisesDao.get(extracurricularExercisesReply.getExtracurricularExercisesId());
-		if("TEACHER".equals(extracurricularExercisesMessage.getRole())&&Objects.nonNull(extracurricularExercisesReply.getAttachments())){
-			extracurricularExercisesReply.setIsReplied(1);
-			extracurricularExercisesReplyDao.update(extracurricularExercisesReply);
+		if("TEACHER".equals(extracurricularExercisesMessage.getRole())){
+			if(extracurricularExercisesReply.getIsReplied()==0&&Objects.nonNull(extracurricularExercisesReply.getAttachments())){
+				extracurricularExercisesReply.setIsReplied(1);
+				extracurricularExercisesReplyDao.update(extracurricularExercisesReply);
+			}
 
 			Map<Integer, String> userMap = new HashMap<>();
 			userMap.put(extracurricularExercisesReply.getUserId(),extracurricularExercisesReply.getUserId().toString());

mec-teacher/src/main/java/com/ym/mec/teacher/controller/CourseHomeworkController.java

@@ -104,7 +104,7 @@ public class CourseHomeworkController extends BaseController {
             if(Objects.isNull(studentExtraExerciseDetail)){
                 return failed("作业不存在");
             }
-            if(Objects.nonNull(studentExtraExerciseDetail.getAttachments())){
+            if(Objects.nonNull(studentExtraExerciseDetail.getAttachments())&&studentExtraExerciseDetail.getStatus().equals(YesOrNoEnum.YES)){
                 ExtracurricularExercisesReply extracurricularExercisesReply=new ExtracurricularExercisesReply();
                 extracurricularExercisesReply.setId(studentExtraExerciseDetail.getCourseHomeworkId());
                 extracurricularExercisesReply.setIsView(1);