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

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

@@ -200,7 +200,21 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      * @author Joburgess
      * @date 2019/10/18
      */
-    int deleteCourseSchedulesByMusicGroupID(@Param("musicGroupID") Long musicGroupID);
+    int deleteCourseSchedulesByMusicGroupID(@Param("musicGroupID") String musicGroupID);
+
+    /**
+     * 逻辑删除乐团课程
+     * @param musicGroupID
+     * @return
+     */
+    int logicDeleteCourseSchedulesByMusicGroupID(@Param("musicGroupID") String musicGroupID);
+    
+    /**
+     * 恢复乐团课程
+     * @param musicGroupID
+     * @return
+     */
+    int resumeCourseScheduleByMusicGroupId(String musicGroupID);
 
     /**
      * @param musicGroupID: 乐团编号

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

@@ -90,7 +90,7 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
 	 * @Date: 2019/9/17
 	 * 批量更新课程计划
 	 */
-	void batchUpdateCourseSchedule(List<CourseSchedule> courseSchedules, Long musicGroupID);
+	void batchUpdateCourseSchedule(List<CourseSchedule> courseSchedules, String musicGroupID);
 
 	/**
 	 * @Author: Joburgess

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

@@ -701,6 +701,13 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         //删除班级跟合奏班关系
         classGroupRelationDao.deleteBySubClassId(classGroupId);
         //删除班级未开始课程
+        List<CourseSchedule> courseScheduleList = courseScheduleService.findNoStartCoursesByClassGroupId(classGroupId);
+        if (courseScheduleList.size() > 0) {
+            List<Long> courseScheduleIds = courseScheduleList.stream().map(courseSchedule -> courseSchedule.getId()).collect(Collectors.toList());
+            courseScheduleTeacherSalaryDao.batchDeleteByCourseScheduleIds(courseScheduleIds);
+            teacherAttendanceDao.batchDeleteByCourseSchedules(courseScheduleIds);
+            courseScheduleStudentPaymentDao.deleteByCourseSchedule(courseScheduleIds);
+        }
 
         //删除班级
         classGroupDao.delete(classGroupId);

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

@@ -193,7 +193,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 	}
 
 	@Override
-	public void batchUpdateCourseSchedule(List<CourseSchedule> courseSchedules, Long musicGroupID) {
+	public void batchUpdateCourseSchedule(List<CourseSchedule> courseSchedules, String musicGroupID) {
 		if(Objects.isNull(courseSchedules)&&courseSchedules.size()<=0){
 			throw new BizException("请选择需要调整的课程!");
 		}

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

@@ -802,6 +802,10 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         // 清除下次缴费时间
         musicGroupStudentFeeDao.updateNextPaymentDate(musicGroupId, null);
         musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId,"暂停乐团",sysUser.getId(),""));
+        
+        //删除课表
+        courseScheduleDao.logicDeleteCourseSchedulesByMusicGroupID(musicGroup.getId());
+        
         return true;
     }
 
@@ -828,6 +832,10 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         // 重新设置下次缴费时间
         musicGroupStudentFeeDao.updateNextPaymentDate(musicGroupId, musicGroupPaymentCalenderService.getNextPaymentDate(musicGroupId));
         musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId,"恢复乐团",sysUser.getId(),""));
+        
+        //恢复课表
+        courseScheduleDao.resumeCourseScheduleByMusicGroupId(musicGroup.getId());
+        
         return true;
     }
 

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

@@ -190,13 +190,16 @@
     </delete>
 
     <delete id="deleteCourseSchedulesByMusicGroupID">
-        DELETE
-        cs
-        FROM
-        course_schedule cs
-        INNER JOIN class_group cg ON cs.class_group_id_=cg.id_
-        WHERE cg.music_group_id_=#{musicGroupID} AND cg.group_type_='MUSIC'
+        DELETE FROM course_schedule WHERE music_group_id_=#{musicGroupID} AND group_type_='MUSIC' and status_ = 'NOT_START'
     </delete>
+    
+    <update id="logicDeleteCourseSchedulesByMusicGroupID">
+    	update course_schedule set del_flag_ = '1' WHERE music_group_id_=#{musicGroupID} AND group_type_='MUSIC' and status_ = 'NOT_START'
+    </update>
+    
+    <update id="resumeCourseScheduleByMusicGroupId">
+    	update course_schedule set del_flag_ = '0' WHERE music_group_id_=#{musicGroupID} AND group_type_='MUSIC' and status_ = 'NOT_START' and del_flag_ = '1'
+    </update>
 
     <delete id="batchDeleteCourseSchedules">
         DELETE FROM course_schedule WHERE id_ IN

mec-web/src/main/java/com/ym/mec/web/controller/CourseScheduleController.java

@@ -100,7 +100,7 @@ public class CourseScheduleController extends BaseController {
     @PostMapping("/batchUpdateCourseSchedule/{musicGroupID}")
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/batchUpdateCourseSchedule')")
     public Object batchUpdateCourseSchedule(@RequestBody List<CourseSchedule> courseSchedules,
-                                            @ApiParam(value = "乐团编号", required = true) @PathVariable("musicGroupID") Long musicGroupID){
+                                            @ApiParam(value = "乐团编号", required = true) @PathVariable("musicGroupID") String musicGroupID){
         scheduleService.batchUpdateCourseSchedule(courseSchedules,musicGroupID);
         return succeed();
     }