Merge branch 'zx_course_convert' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -1961,4 +1961,5 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      */
     List<String> queryStartedCourseMusicGroupIdList(String groupType);
 
+    void batchUpdateDelFlag(@Param("courseIds") String courseIds);
 }

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

@@ -82,7 +82,7 @@ public class CourseConvertLogServiceImpl extends BaseServiceImpl<Integer, Course
 		courseConvertLog.setOldClassName(classGroup.getName());
 		courseConvertLog.setOldCourseJson(JSONObject.toJSONString(courseSchedules));
 		//删除课程
-		courseScheduleDao.batchDeleteCourseSchedulesWithoutCheck(oldCourseIdList);
+		courseScheduleDao.batchDeleteByCourseSchedules(oldCourseIdList);
 
 		//记录老师考勤
 		List<TeacherAttendance> teacherAttendances = teacherAttendanceDao.findByCourseSchedules(oldCourseIdList);

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

@@ -162,8 +162,9 @@ public class CourseScheduleConvertServiceImpl implements CourseScheduleConvertSe
         this.checkConvertRevoke(courseConvertLog);
         List<Long> newCourseIdList = Arrays.stream(courseConvertLog.getNewCourseIds().split(",")).map(e -> Long.parseLong(e)).collect(Collectors.toList());
         List<Integer> userIdList = Arrays.stream(courseConvertLog.getStudentIds().split(",")).map(e -> Integer.parseInt(e)).collect(Collectors.toList());
-        List<CourseSchedule> courseSchedules = JSONArray.parseArray(courseConvertLog.getOldCourseJson(), CourseSchedule.class);
-        courseScheduleService.getDao().batchAddCourseSchedules(courseSchedules);
+//        List<CourseSchedule> courseSchedules = JSONArray.parseArray(courseConvertLog.getOldCourseJson(), CourseSchedule.class);
+        courseScheduleService.getDao().batchUpdateDelFlag(courseConvertLog.getNewCourseIds());
+//        courseScheduleService.getDao().batchAddCourseSchedules(courseSchedules);
 
         String studentMapperJson = courseConvertLog.getOldCourseStudentMapperJson();
         List<CourseScheduleStudentPayment> studentPayments = JSONArray.parseArray(studentMapperJson, CourseScheduleStudentPayment.class);

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

@@ -3185,6 +3185,9 @@
     <update id="markFreeCourse">
         UPDATE course_schedule SET member_flag_ = 1 WHERE FIND_IN_SET(id_,#{courseIds})
     </update>
+    <update id="batchUpdateDelFlag">
+        UPDATE course_schedule SET del_flag_ = 1,update_time_ = NOW() WHERE FIND_IN_SET(id_,#{courseIds})
+    </update>
 
     <select id="getStudentCourseScheduleNum" resultMap="com.ym.mec.biz.dal.dao.PracticeGroupDao.courseGroupExport">
         SELECT COUNT(*) total_class_times_,cssp.user_id_ student_id_