Merge branch 'online1'

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

@@ -951,6 +951,12 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
                                                     @Param("groupId") String groupId);
 
     /**
+     * @describe 获取未开始的课程
+     * @param courseScheduleId
+     */
+    CourseSchedule getSurplusCourseWithGroup(@Param("courseScheduleId") Long courseScheduleId);
+
+    /**
      * @describe 统计班级上已结束课时数
      * @author Joburgess
      * @date 2019/12/25

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

@@ -2930,9 +2930,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         if(Objects.isNull(courseSchedule.getStartClassTime())){
             throw new BizException("请指定上课时间");
         }
-        CourseSchedule oldCourseSchedule = courseScheduleDao.get(courseScheduleId);
+        CourseSchedule oldCourseSchedule = courseScheduleDao.getSurplusCourseWithGroup(courseScheduleId);
         if(Objects.isNull(oldCourseSchedule)){
-            throw new BizException("未找到对应课程");
+            throw new BizException("调整失败: 课程状态异常");
         }
         if(!oldCourseSchedule.getGroupType().equals(GroupType.PRACTICE)){
             throw new BizException("请选择陪练课");
@@ -3006,9 +3006,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         if(Objects.isNull(teacherId)){
             throw new BizException("请指定上课老师");
         }
-        CourseSchedule oldCourseSchedule = courseScheduleDao.get(courseScheduleId);
+        CourseSchedule oldCourseSchedule = courseScheduleDao.getSurplusCourseWithGroup(courseScheduleId);
         if(Objects.isNull(oldCourseSchedule)){
-            throw new BizException("未找到对应课程");
+            throw new BizException("调整失败: 课程状态异常");
         }
         if(!oldCourseSchedule.getGroupType().equals(GroupType.PRACTICE)){
             throw new BizException("请选择陪练课");

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

@@ -1947,6 +1947,14 @@
             AND CONCAT( cs.class_date_, ' ', cs.start_class_time_ ) > NOW()
             AND cs.music_group_id_ = #{groupId}
     </select>
+
+    <select id="getSurplusCourseWithGroup" resultMap="CourseSchedule">
+        SELECT * FROM course_schedule cs
+        WHERE
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+            AND CONCAT( cs.class_date_, ' ', cs.start_class_time_ ) > NOW()
+            AND cs.id_ = #{courseScheduleId}
+    </select>
     <select id="countClassGroupOverCourseNum" resultType="int">
         SELECT COUNT(*) FROM course_schedule WHERE class_group_id_=#{classGroupId} AND CONCAT(class_date_,' ',end_class_time_)&lt;NOW()
     </select>