ignore_files

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

@@ -73,7 +73,7 @@ public class ExtracurricularExercisesMessageServiceImpl extends BaseServiceImpl<
 					null, extracurricularExercises.getTitle(), extracurricularExercisesMessage.getContent());
 			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.EXTRA_TEACHER_REPLY_PUSH,
 					userMap, null, 0, notifyUrl, "STUDENT", extracurricularExercises.getTitle());
-		}else{
+		}else if("STUDENT".equals(extracurricularExercisesMessage.getRole())&&Objects.nonNull(extracurricularExercisesReply.getAttachments())){
 			Map<Integer, String> userMap = new HashMap<>();
 			userMap.put(extracurricularExercises.getTeacherId(), extracurricularExercises.getTeacherId().toString());
 			SysUser user = teacherDao.getUser(extracurricularExercisesReply.getUserId());

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

@@ -115,6 +115,7 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 		if(Objects.isNull(existExtra)){
 			throw new BizException("作业不存在");
 		}
+		boolean push=Objects.isNull(existExtra.getAttachments());
 		ExtracurricularExercises extracurricularExercises = extracurricularExercisesDao.get(existExtra.getExtracurricularExercisesId());
 		if(Objects.isNull(extracurricularExercises)){
 			throw new BizException("作业不存在");
@@ -127,15 +128,17 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 		extracurricularExercises.setCompletedNum(submitStudentNum);
 		extracurricularExercisesDao.update(extracurricularExercises);
 
-		Map<Integer, String> userMap = new HashMap<>();
-		userMap.put(extracurricularExercises.getTeacherId(), extracurricularExercises.getTeacherId().toString());
-		SysUser user = teacherDao.getUser(existExtra.getUserId());
-		String notifyUrl = "9?courseScheduleID=" + existExtra.getId() + "&userId=" + existExtra.getUserId() + "&studentCourseHomeworkId=" + existExtra.getId()+ "&extra=1";
-		sysMessageService.batchSendImMessage(MessageTypeEnum.EXTRA_SUBMIT_IM,existExtra.getUserId().toString(),
-				new String[]{extracurricularExercises.getTeacherId().toString()},
-				null,extracurricularExercises.getTitle());
-		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.EXTRA_SUBMIT_PUSH,
-				userMap, null, 0, notifyUrl, "TEACHER",
-				extracurricularExercises.getTitle(), user.getUsername());
+		if(push){
+			Map<Integer, String> userMap = new HashMap<>();
+			userMap.put(extracurricularExercises.getTeacherId(), extracurricularExercises.getTeacherId().toString());
+			SysUser user = teacherDao.getUser(existExtra.getUserId());
+			String notifyUrl = "9?courseScheduleID=" + existExtra.getId() + "&userId=" + existExtra.getUserId() + "&studentCourseHomeworkId=" + existExtra.getId()+ "&extra=1";
+			sysMessageService.batchSendImMessage(MessageTypeEnum.EXTRA_SUBMIT_IM,existExtra.getUserId().toString(),
+					new String[]{extracurricularExercises.getTeacherId().toString()},
+					null,extracurricularExercises.getTitle());
+			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.EXTRA_SUBMIT_PUSH,
+					userMap, null, 0, notifyUrl, "TEACHER",
+					extracurricularExercises.getTitle(), user.getUsername());
+		}
 	}
 }

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

@@ -83,9 +83,11 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void submitHomework(StudentCourseHomework bean) {
-        if (Objects.isNull(bean) || Objects.isNull(bean.getId())) {
+        StudentCourseHomework existHomework = studentCourseHomeworkDao.get(bean.getId());
+        if (Objects.isNull(bean) || Objects.isNull(bean.getId()) || Objects.isNull(existHomework)) {
             throw new BizException("作业不存在");
         }
+        boolean push = Objects.isNull(bean.getAttachments());
         super.update(bean);
         bean = studentCourseHomeworkDao.get(bean.getId());
         CourseSchedule courseSchedule = courseScheduleDao.get(bean.getCourseScheduleId());
@@ -103,17 +105,20 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
                 courseScheduleReviewDao.update(review);
             }
         }
-        Map<Integer, String> userMap = new HashMap<>();
-        userMap.put(courseSchedule.getActualTeacherId(), courseSchedule.getActualTeacherId().toString());
-        SysUser user = teacherDao.getUser(bean.getUserId());
-        String notifyUrl = "9?courseScheduleID=" + bean.getId() + "&userId=" + bean.getUserId() + "&studentCourseHomeworkId=" + bean.getId() + "&extra=0";
-        String courseDate = DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy年MM月dd日");
-        sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_SUBMIT_PUSH,bean.getUserId().toString(),
-                new String[]{courseSchedule.getActualTeacherId().toString()},
-                null,courseDate,courseSchedule.getName());
-        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_SUBMIT_PUSH,
-                userMap, null, 0, notifyUrl, "TEACHER", courseSchedule.getName(), courseDate, user.getUsername());
-        courseHomeworkService.update(courseHomework);
+
+        if(push){
+            Map<Integer, String> userMap = new HashMap<>();
+            userMap.put(courseSchedule.getActualTeacherId(), courseSchedule.getActualTeacherId().toString());
+            SysUser user = teacherDao.getUser(bean.getUserId());
+            String notifyUrl = "9?courseScheduleID=" + bean.getId() + "&userId=" + bean.getUserId() + "&studentCourseHomeworkId=" + bean.getId() + "&extra=0";
+            String courseDate = DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy年MM月dd日");
+            sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_SUBMIT_PUSH,bean.getUserId().toString(),
+                    new String[]{courseSchedule.getActualTeacherId().toString()},
+                    null,courseDate,courseSchedule.getName());
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_SUBMIT_PUSH,
+                    userMap, null, 0, notifyUrl, "TEACHER", courseSchedule.getName(), courseDate, user.getUsername());
+            courseHomeworkService.update(courseHomework);
+        }
     }
 
     @Override