zouxuan 5 years ago
parent
commit
c72f491663

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

@@ -3141,9 +3141,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         }
         LOGGER.info("清空老师和学生考勤,user:{},参数:{}",user.getId(),courseScheduleIds);
         List<Long> courseScheduleId = courseScheduleTeacherSalaryService.querySettlementScheduleId(courseScheduleIds);
-        if(courseScheduleId != null && courseScheduleId.size() > 0){
-            teacherAttendanceDao.batchCleanCourseTeacherSignInfo(courseScheduleId);
-            studentAttendanceDao.deleteByCourseSchedules(courseScheduleId);
+        if(courseScheduleId == null || courseScheduleId.size() == 0){
+            throw new BizException("没有可修改的课程");
         }
+        teacherAttendanceDao.batchCleanCourseTeacherSignInfo(courseScheduleId);
+        studentAttendanceDao.deleteByCourseSchedules(courseScheduleId);
     }
 }

+ 3 - 1
mec-biz/src/main/resources/config/mybatis/CourseScheduleRewardsMapper.xml

@@ -144,9 +144,11 @@
 		<result property="teacherId" column="actual_teacher_id_"/>
 		<result property="times" column="times_"/>
 		<result property="activeId" column="active_id_"/>
+		<result property="courseScheduleIds" column="courseScheduleIds"/>
 	</resultMap>
     <select id="queryVipGroupTeacherClassTimesByMonth" resultMap="TaskRewardsRulesDtoMap">
-		SELECT COUNT(cs.id_) times_,cs.actual_teacher_id_,csrr.id_ active_id_ FROM course_schedule_rewards_rules csrr
+		SELECT COUNT(cs.id_) times_,cs.actual_teacher_id_,csrr.id_ active_id_,GROUP_CONCAT(cs.id_) courseScheduleIds
+		FROM course_schedule_rewards_rules csrr
 		LEFT JOIN vip_group vg ON FIND_IN_SET(vg.vip_group_category_id_,csrr.vip_group_category_id_list_)
 		LEFT JOIN course_schedule cs ON vg.id_ = cs.music_group_id_
 		LEFT JOIN class_group cg ON cg.id_ = cs.class_group_id_