Merge remote-tracking branch 'origin/master'

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

@@ -414,7 +414,7 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
         teacherAttendanceDao.batchInsert(teacherAttendances);
 
         try {
-            courseScheduleService.checkNewCourseSchedulesWithoutMusicGroup(practiceCourses,false);
+            courseScheduleService.checkNewCourseSchedules(practiceCourses,false);
         } catch (Exception e) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             String errMessage=new String();
@@ -1090,7 +1090,7 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
         teacherAttendanceDao.batchInsert(teacherAttendances);
 
         try {
-            courseScheduleService.checkNewCourseSchedulesWithoutMusicGroup(practiceCourses,false);
+            courseScheduleService.checkNewCourseSchedules(practiceCourses,false);
         } catch (Exception e) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             String errMessage;

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

@@ -1793,7 +1793,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         SysUser sysUser = sysUserFeignService.queryUserById(practiceGroup.getStudentId());
 
         practiceGroup.setCoursesStartDate(allCourseDates.get(0));
-        practiceGroup.setCoursesExpireDate(courseExpireDate);
+        practiceGroup.setCoursesExpireDate(allCourseDates.get(3));
         Teacher teacher = teacherService.getDetail(practiceGroup.getUserId());
         if (Objects.isNull(teacher)) {
             throw new BizException("老师不存在");
@@ -3016,8 +3016,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         teacherAttendanceDao.batchInsert(teacherAttendances);
 
         try {
-//            courseScheduleService.checkNewCourseSchedules(practiceCourses,false);
-            courseScheduleService.checkNewCourseSchedulesWithoutMusicGroup(practiceCourses,false);
+            courseScheduleService.checkNewCourseSchedules(practiceCourses,false);
+//            courseScheduleService.checkNewCourseSchedulesWithoutMusicGroup(practiceCourses,false);
         } catch (Exception e) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             String errMessage=new String();

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

@@ -2461,7 +2461,6 @@
         FROM course_schedule_teacher_salary csts
                  LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
         WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-          AND cs.group_type_ != 'MUSIC'
           AND cs.class_date_ BETWEEN DATE_FORMAT(#{startTime}, "%Y-%m-%d") AND DATE_FORMAT(#{endTime}, "%Y-%m-%d")
           AND csts.user_id_ = #{userId}
     </select>

mec-web/src/main/java/com/ym/mec/web/controller/TaskController.java

@@ -230,8 +230,8 @@ public class TaskController extends BaseController {
 	//学生服务信息统计
 	@GetMapping("/exercisesSituationStatistics")
 	public void exercisesSituationStatistics(){
-//		extracurricularExercisesReplyService.exercisesSituationStatistics2(null);
-		studentServeService.exercisesSituationStatistics(null);
+		extracurricularExercisesReplyService.exercisesSituationStatistics2(null);
+//		studentServeService.exercisesSituationStatistics(null);
 	}
 
 	//更新学生运营指标