Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_saas_courseware_search

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

@@ -2087,4 +2087,6 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
 
     //获取老师可以查看的班级课程列表
     List<Long> queryTeacherCanViewClassCourseSchedule(@Param("classGroupId") Long classGroupId, @Param("userId") Long userId);
+
+    void cleanDelFlag(@Param("courseIds") String courseIds);
 }

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

@@ -163,9 +163,9 @@ public class CourseScheduleConvertServiceImpl implements CourseScheduleConvertSe
         List<Integer> userIdList = Arrays.stream(courseConvertLog.getStudentIds().split(",")).map(Integer::parseInt).collect(Collectors.toList());
         List<CourseSchedule> courseSchedules = JSONArray.parseArray(courseConvertLog.getOldCourseJson(), CourseSchedule.class);
 //        courseScheduleService.getDao().batchUpdateDelFlag(courseConvertLog.getOldCourseIds());
-        //清除课程编号
-        courseSchedules.forEach(e->e.setId(null));
-        courseScheduleService.getDao().batchInsert(courseSchedules);
+        //清除课程删除标记
+        courseScheduleService.getDao().cleanDelFlag(courseConvertLog.getOldCourseIds());
+//        courseScheduleService.getDao().batchUpdate(courseSchedules);
 
         String studentMapperJson = courseConvertLog.getOldCourseStudentMapperJson();
         List<CourseScheduleStudentPayment> studentPayments = JSONArray.parseArray(studentMapperJson, CourseScheduleStudentPayment.class);

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

@@ -1428,7 +1428,7 @@
                 <if test="item.leaveStudentNum != null">
                     leave_student_num_ = #{item.leaveStudentNum},
                 </if>
-                schoole_id_ = #{item.schoolId},
+                schoole_id_ = #{item.schoolId},del_flag_ = 0,
                 service_provider_ = #{item.serviceProvider},
                 <if test="item.schoolId == null">
                     schoole_id_ = null,
@@ -4551,6 +4551,9 @@
     <update id="configCourseware">
         update course_schedule set courseware_detail_id_ = #{coursewareDetailId} where id_ = #{courseId}
     </update>
+    <update id="cleanDelFlag">
+        update course_schedule set del_flag_ = 0,del_time_ = NULL where FIND_IN_SET(id_,#{courseIds})
+    </update>
 
     <select id="getTeacherContinuousCourse" resultMap="CourseSchedule">
         SELECT <include refid="resultSql"/> FROM course_schedule cs