Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zouxuan-2022-05-27

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/MessageTypeEnum.java

@@ -194,7 +194,7 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
 
     OA_NOTICE_PUSH("OA_NOTICE_PUSH", "待审批提醒"),
     OA_CC_NOTICE_PUSH("OA_CC_NOTICE_PUSH", "审批抄送提醒"),
-    OA_END_NOTICE_PUSH("OA_PASS_NOTICE_PUSH", "审批结束提醒"),
+    OA_END_NOTICE_PUSH("OA_END_NOTICE_PUSH", "审批结束提醒"),
 
     //团练宝
     TRAIN_NO_RANK_STUDENT_PUSH("TRAIN_NO_RANK_STUDENT_PUSH", "团练宝训练提醒"),

mec-biz/src/main/java/com/ym/mec/biz/service/CourseScheduleService.java

@@ -120,6 +120,13 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
 	 * @Date: 2019/9/17
 	 * 批量插入课程计划
 	 */
+	void batchAddCourseSchedule1(List<CourseSchedule> courseSchedules);
+
+	/**
+	 * @Author: Joburgess
+	 * @Date: 2019/9/17
+	 * 批量插入课程计划
+	 */
 	void batchAddCourseSchedule(List<CourseSchedule> courseSchedules);
 
 	/**

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

@@ -1072,6 +1072,17 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 	@Override
     @Transactional(rollbackFor = Exception.class)
+    public void batchAddCourseSchedule1(List<CourseSchedule> courseSchedules) {
+        if (Objects.isNull(courseSchedules) && courseSchedules.size() <= 0) {
+            throw new BizException("参数错误!");
+        }
+//        checkNewCourseSchedules(courseSchedules, false,false);
+        createCourseScheduleName(courseSchedules);
+        courseScheduleDao.batchAddCourseSchedules(courseSchedules);
+    }
+
+	@Override
+    @Transactional(rollbackFor = Exception.class)
     public void batchAddCourseSchedule(List<CourseSchedule> courseSchedules) {
         if (Objects.isNull(courseSchedules) && courseSchedules.size() <= 0) {
             throw new BizException("参数错误!");

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

@@ -2782,7 +2782,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                     List<CourseSchedule> courseSchedules = JSON.parseArray(vipGroup.getCourseSchedulesJson(), CourseSchedule.class);
                     classGroup.setTotalClassTimes(courseSchedules.size());
 
-                    courseScheduleService.batchAddCourseSchedule(courseSchedules);
+                    courseScheduleService.batchAddCourseSchedule1(courseSchedules);
 
                     //考勤信息
                     List<TeacherAttendance> teacherAttendances = new ArrayList<>();