1、陪练课调整

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

@@ -734,6 +734,15 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      */
     List<Map<Integer, Integer>> countClassGroupCourseTimes(@Param("classGroupIds") List<Integer> classGroupIds);
 
+    /**
+     * @describe 统计班级上的课程数量
+     * @author Joburgess
+     * @date 2020/2/13
+     * @param classGroupId:
+     * @return int
+     */
+    int countClassGroupCourses(@Param("classGroupId") Integer classGroupId);
+
 
     /**
      * 根据班级编号列表删除课程

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

@@ -71,7 +71,11 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public int update(StudentCourseHomework bean) {
+		if(Objects.isNull(bean)){
+			throw new BizException("作业不存在");
+		}
 		super.update(bean);
 		bean=studentCourseHomeworkDao.get(bean.getId());
 		CourseSchedule courseSchedule = courseScheduleDao.get(bean.getCourseScheduleId());
@@ -86,6 +90,9 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
 
 	@Override
 	public CourseHomeworkStudentDetailDto findCourseHomeworkStudentDetail(Long courseScheduleID, Long userId) {
+		if(Objects.isNull(courseScheduleID)){
+			throw new BizException("作业不存在");
+		}
 		return studentCourseHomeworkDao.findCourseHomeworkStudentDetail(courseScheduleID, userId);
 	}
 

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

@@ -1698,6 +1698,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		studentPauseInfoDao.update(studentPauseInfo);
         vipGroup.setStatus(VipGroupStatusEnum.PROGRESS);
         vipGroupDao.update(vipGroup);
+        classGroup.setTotalClassTimes(courseScheduleDao.countClassGroupCourses(classGroup.getId()));
+        classGroupDao.update(classGroup);
 		courseScheduleTeacherSalaryService.updateVipGroupCourseTeacherSalary(vipGroup.getId().intValue(),1,vipGroup.getStatus());
 	}
 

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

@@ -1648,10 +1648,10 @@
     </select>
     <select id="countClassGroupCourseTimes" resultType="map">
         SELECT
-            class_group_id_ AS 'key',
-            COUNT(id_) AS 'value'
+        class_group_id_ AS 'key',
+        COUNT(id_) AS 'value'
         FROM
-            course_schedule
+        course_schedule
         <where>
             <if test="classGroupIds!=null">
                 class_group_id_ IN
@@ -1664,6 +1664,14 @@
 
         GROUP BY class_group_id_
     </select>
+    <select id="countClassGroupCourses" resultType="int">
+        SELECT
+            COUNT(1)
+        FROM
+            course_schedule
+        WHERE class_group_id_ = #{classGroupId}
+          AND (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+    </select>
     <select id="findMusicGroupCourseSchedules" resultMap="CourseSchedule">
         SELECT
             cs.*