Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -2047,18 +2047,17 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
     @Override
     public void updateClassGroupInfo(Integer classGroupId) {
+        Date now = new Date();
         ClassGroup classGroup=classGroupDao.get(classGroupId);
         List<CourseSchedule> courseSchedules = courseScheduleDao.findClassGroupCourseSchedules(classGroupId);
         int totalClassTimes=courseSchedules.size();
         int currentClassTimes=0;
         for (CourseSchedule courseSchedule : courseSchedules) {
-            if(courseSchedule.getStatus().equals(CourseStatusEnum.OVER)){
+            if(courseSchedule.getEndClassTime().before(now)){
                 currentClassTimes+=1;
             }
         }
 
-        Date now = new Date();
-
         classGroup.setTotalClassTimes(totalClassTimes);
         classGroup.setCurrentClassTimes(currentClassTimes);
         Integer studentNum = classGroupStudentMapperDao.countClassGroupStudentNum(classGroupId);

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

@@ -1350,11 +1350,13 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				courseScheduleTeacherSalaryDao.batchDeleteByCourseAndTeacher(newCourseSchedule.getId(),beReplaceTeacherIds);
 				teacherAttendanceDao.batchDeleteByCourseAndUsers(newCourseSchedule.getId().intValue(),beReplaceTeacherIds);
 			}
+			classGroupService.updateClassGroupInfo(oldCourseSchedule.getClassGroupId());
 		});
 		//生成修改后的教师课酬
 		if(!CollectionUtils.isEmpty(needCreateCourseScheduleTeacherSalaryCourse)){
 			classGroupTeacherMapperService.createCourseScheduleTeacherSalary(needCreateCourseScheduleTeacherSalaryCourse,oldCourseSchedules);
 		}
+
 		try {
 			//推送课时调整
 			Set<Integer> teacherIds = newCourseSchedules.stream().map(e -> e.getActualTeacherId()).collect(Collectors.toSet());

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

@@ -1598,8 +1598,28 @@
         SELECT count(cs.id_) FROM course_schedule cs WHERE cs.music_group_id_ = #{musicGroupId} LIMIT 1
     </select>
     <select id="findClassGroupCourseSchedules" resultMap="CourseSchedule">
-        SELECT * FROM course_schedule
-        WHERE class_group_id_=#{classGroupId} AND (del_flag_ = 0 OR del_flag_ IS NULL)
+        SELECT
+          cs.id_,
+            cs.class_group_id_,
+            cs.status_,
+            cs.subsidy_,
+            cs.class_date_,
+            CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
+            CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
+            cs.start_class_time_ start_class_time_str_,
+            cs.end_class_time_ end_class_time_str_,
+            cs.teacher_id_,
+            cs.actual_teacher_id_,
+            cs.create_time_,
+            cs.update_time_,
+            cs.teach_mode_,
+            cs.type_,
+            cs.name_,
+            cs.student_num_,
+            cs.leave_student_num_,
+            cs.schoole_id_
+        FROM course_schedule cs
+        WHERE cs.class_group_id_=#{classGroupId} AND (cs.del_flag_ = 0 OR cs.del_flag_ IS NULL)
     </select>
     <select id="countVipGroupCourses" resultType="int">
         SELECT count(cs.id_) FROM course_schedule cs WHERE cs.music_group_id_ = #{vipGroupId} AND cs.group_type_='VIP'