update

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseHomeworkDao.java

@@ -46,4 +46,6 @@ public interface CourseHomeworkDao extends BaseDAO<Long, CourseHomework> {
      * @return
      */
     List<Mapper> queryTeacerNoReplyNum();
+    
+    int delByCourseScheduleId(Long courseScheduleId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentCourseHomeworkDao.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.dao;
 import com.ym.mec.biz.dal.dto.CourseHomeworkStudentDetailDto;
 import com.ym.mec.biz.dal.entity.StudentCourseHomework;
 import com.ym.mec.common.dal.BaseDAO;
+
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
@@ -90,4 +91,6 @@ public interface StudentCourseHomeworkDao extends BaseDAO<Long, StudentCourseHom
      * @return
      */
     List<StudentCourseHomework> findStudentCourseHomeworks(Map<String, Object> params);
+    
+    int delByCourseScheduleId(Long courseScheduleId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/CourseHomeworkService.java

@@ -22,4 +22,11 @@ public interface CourseHomeworkService extends BaseService<Long, CourseHomework>
 	 * 作业未回复提醒
 	 */
 	void homeworkNoReplyRemind();
+
+	/**
+	 * 删除指定课程的作业
+	 * @param courseScheduleId
+	 * @return
+	 */
+	boolean delHomwworkByCourseScheduleId(Long courseScheduleId);
 }

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.biz.dal.dao.CourseHomeworkDao;
+import com.ym.mec.biz.dal.dao.StudentCourseHomeworkDao;
 import com.ym.mec.biz.dal.dto.Mapper;
 import com.ym.mec.biz.dal.dto.TeacherHomeworkListDto;
 import com.ym.mec.biz.dal.entity.CourseHomework;
@@ -12,8 +13,11 @@ import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext.MessageSender;
 import com.ym.mec.util.collection.MapUtil;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -26,6 +30,10 @@ public class CourseHomeworkServiceImpl extends BaseServiceImpl<Long, CourseHomew
 
 	@Autowired
 	private CourseHomeworkDao courseHomeworkDao;
+	
+	@Autowired
+	private StudentCourseHomeworkDao studentCourseHomeworkDao;
+	
 	@Autowired
 	private SysMessageService sysMessageService;
 
@@ -84,4 +92,16 @@ public class CourseHomeworkServiceImpl extends BaseServiceImpl<Long, CourseHomew
 			sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.TEACHER_PUSH_JOB_WAIT_REPLY, receivers, null, 0, "6?", "TEACHER", mapper.getValue());
 		}
 	}
+
+	@Override
+    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+	public boolean delHomwworkByCourseScheduleId(Long courseScheduleId) {
+		//删除作业
+		courseHomeworkDao.delByCourseScheduleId(courseScheduleId);
+		//删除学生作业
+		studentCourseHomeworkDao.delByCourseScheduleId(courseScheduleId);
+		//删除学生回复的作业
+		
+		return true;
+	}
 }

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

@@ -112,6 +112,7 @@ import com.ym.mec.biz.dal.page.StudentCourseScheduleRecordQueryInfo;
 import com.ym.mec.biz.dal.page.VipGroupQueryInfo;
 import com.ym.mec.biz.service.ClassGroupService;
 import com.ym.mec.biz.service.ClassGroupTeacherMapperService;
+import com.ym.mec.biz.service.CourseHomeworkService;
 import com.ym.mec.biz.service.CourseScheduleService;
 import com.ym.mec.biz.service.CourseScheduleStudentPaymentService;
 import com.ym.mec.biz.service.CourseScheduleTeacherSalaryService;
@@ -189,6 +190,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
     private MusicGroupService musicGroupService;
     @Autowired
     private SysConfigService sysConfigService;
+    
+    @Autowired
+    private CourseHomeworkService courseHomeworkService;
+    
     @Autowired
     private GroupDao groupDao;
     @Autowired
@@ -1844,7 +1849,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					}
 					
 					//清理课程作业
-					
+					courseHomeworkService.delHomwworkByCourseScheduleId(courseScheduleId);
 				}
 			}
 

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

@@ -24,6 +24,7 @@ import com.ym.mec.thirdparty.message.MessageSenderPluginContext.MessageSender;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.http.HttpUtil;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -1099,7 +1100,10 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         teacherIds.addAll(teacherDao.findVipTeacherIds(studentId));
         //获取陪练课老师列表
         teacherIds.addAll(teacherDao.findPracticeTeacherIds(studentId));
-        return teacherDao.queryTeacherBaseInfo(teacherIds);
+        if(teacherIds.size() > 0){
+        	return teacherDao.queryTeacherBaseInfo(teacherIds);
+        }
+        return new ArrayList<BasicUserDto>();
     }
 
     @Override

mec-biz/src/main/resources/config/mybatis/CourseHomeworkMapper.xml

@@ -237,4 +237,8 @@
 		where cs.del_flag_ = 0 AND cs.actual_teacher_id_ IS NOT NULL
 		AND sch.is_replied_ = 0 group by cs.actual_teacher_id_
 	</select>
+	
+	<delete id="delByCourseScheduleId" >
+		DELETE FROM course_homework WHERE course_schedule_id_ = #{courseScheduleId} 
+	</delete>
 </mapper>

mec-biz/src/main/resources/config/mybatis/StudentCourseHomeworkMapper.xml

@@ -286,4 +286,8 @@
         ORDER BY sch.id_ DESC
         <include refid="global.limit"/>
     </select>
+    
+    <delete id="delByCourseScheduleId">
+		DELETE FROM student_course_homework WHERE course_schedule_id_ = #{courseScheduleId} 
+	</delete>
 </mapper>