1、课表organ_id_字段初始化

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

@@ -398,6 +398,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 						courseSchedule.setType(CourseSchedule.CourseScheduleType.HIGH);
 						courseSchedule.setGroupType(GroupType.MUSIC);
 						courseSchedule.setName(courseScheduleName + "-" + CourseSchedule.CourseScheduleType.HIGH.getMsg());
+                        courseSchedule.setOrganId(musicGroup.getOrganId());
 						courseScheduleList.add(courseSchedule);
 						times++;
 					}
@@ -1393,6 +1394,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 courseSchedule.setTeachMode(TeachModeEnum.OFFLINE);
                 courseSchedule.setType(classGroup4MixDto.getCourseType());
                 courseSchedule.setGroupType(GroupType.MUSIC);
+                courseSchedule.setOrganId(musicGroup.getOrganId());
                 if(classGroup4MixDto.getCourseType().equals(CourseSchedule.CourseScheduleType.MIX)){
                     courseSchedule.setName(classGroup4MixDto.getCourseType().getMsg());
                 }else{
@@ -1690,6 +1692,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 courseSchedule.setGroupType(GroupType.MUSIC);
                 courseSchedule.setTeacherId(teacherId);
                 courseSchedule.setActualTeacherId(teacherId);
+                courseSchedule.setOrganId(musicGroup.getOrganId());
                 courseScheduleDao.insert(courseSchedule);
                 courseScheduleList.add(courseSchedule);
                 times++;
@@ -1958,6 +1961,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 }
                 courseSchedule.setTeacherId(teacherId);
                 courseSchedule.setActualTeacherId(teacherId);
+                courseSchedule.setOrganId(musicGroup.getOrganId());
                 courseScheduleList.add(courseSchedule);
 
                 courseScheduleDao.insert(courseSchedule);

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

@@ -333,9 +333,15 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 		Date entryDate = null;
 		String settlementType = null;
+		Integer organId = null;
 
 		// 查询老师默认课酬
 		if (type == CourseScheduleType.PRACTICE) {
+			PracticeGroup practiceGroup = practiceGroupDao.get(Long.valueOf(classGroup.getMusicGroupId()));
+			if(Objects.isNull(practiceGroup)){
+				throw new BizException("找不到网管课信息");
+			}
+			organId=practiceGroup.getOrganId();
 
 			List<TeacherDefaultPracticeGroupSalary> teacherDefaultPracticeGroupSalaryList = teacherDefaultPracticeGroupSalaryDao
 					.queryByUserIdList(teacherIdList);
@@ -348,6 +354,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			if (musicGroup == null) {
 				throw new BizException("找不到乐团信息");
 			}
+			organId=musicGroup.getOrganId();
 			// 乐团结算方式
 			settlementType = musicGroup.getSettlementType().getCode();
 
@@ -462,6 +469,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					courseSchedule.setName(classGroup.getName());
 					courseSchedule.setSchoolId(schoolId);
 					courseSchedule.setSubsidy(subSidy);
+					courseSchedule.setOrganId(organId);
 					if (type == CourseScheduleType.PRACTICE || type == CourseScheduleType.VIP) {
 						courseSchedule.setName(subjectName + "•" + usernameList);
 					} else {

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

@@ -150,6 +150,7 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
             newCourse.setIsLock(0);
             newCourse.setStatus(CourseStatusEnum.NOT_START);
             newCourse.setName(courseGroup.getName());
+            newCourse.setOrganId(courseGroup.getOrganId());
         }
         try {
             courseScheduleService.checkNewCourseSchedules(newCourses,false);

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

@@ -364,6 +364,7 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
             courseSchedule.setType(CourseSchedule.CourseScheduleType.PRACTICE);
             courseSchedule.setGroupType(GroupType.PRACTICE);
             courseSchedule.setIsLock(1);
+            courseSchedule.setOrganId(practiceGroupBuyParams.getOrganId());
         }
         courseScheduleDao.batchAddCourseSchedules(practiceCourses);
         TeacherDefaultPracticeGroupSalary teacherDefaultPracticeGroupSalary = teacherDefaultPracticeGroupSalaryDao.findByTeacherAndCourseMinutes(practiceGroupBuyParams.getUserId(),practiceCourseMinutes);
@@ -1039,6 +1040,7 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
             courseSchedule.setCreateTime(now);
             courseSchedule.setUpdateTime(now);
             courseSchedule.setIsLock(0);
+            courseSchedule.setOrganId(practiceGroupBuyParams.getOrganId());
             practiceCourses.add(courseSchedule);
         }
         practiceCourses.sort(Comparator.comparing(CourseSchedule::getStartClassTime));

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

@@ -1921,6 +1921,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             courseSchedule.setType(CourseSchedule.CourseScheduleType.PRACTICE);
             courseSchedule.setGroupType(GroupType.PRACTICE);
             courseSchedule.setName(practiceGroup.getName());
+            courseSchedule.setOrganId(practiceGroup.getOrganId());
             courseScheduleDao.insert(courseSchedule);
 
             //课程与老师薪水表
@@ -2911,6 +2912,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             courseSchedule.setType(CourseSchedule.CourseScheduleType.PRACTICE);
             courseSchedule.setGroupType(GroupType.PRACTICE);
             courseSchedule.setIsLock(1);
+            courseSchedule.setOrganId(practiceGroupBuyParams.getOrganId());
         }
         courseScheduleDao.batchAddCourseSchedules(practiceCourses);
         TeacherDefaultPracticeGroupSalary teacherDefaultPracticeGroupSalary = teacherDefaultPracticeGroupSalaryDao.findByTeacherAndCourseMinutes(practiceGroupBuyParams.getUserId(),practiceCourseMinutes);

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

@@ -382,6 +382,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		    courseSchedule.setType(CourseSchedule.CourseScheduleType.VIP);
 			courseSchedule.setClassGroupId(classGroup.getId());
 			courseSchedule.setName(vipGroupApplyBaseInfoDto.getName());
+			courseSchedule.setOrganId(vipGroupApplyBaseInfoDto.getOrganId());
 		});
 		courseScheduleService.checkNewCourseSchedules(vipGroup.getCourseSchedules(),false);
 		vipGroupApplyBaseInfoDto.setCourseSchedulesJson(JSON.toJSONString(vipGroup.getCourseSchedules()));
@@ -1750,6 +1751,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				if(newCourseSchedules.get(i).getTeachMode().equals(TeachModeEnum.OFFLINE)){
 					newCourseSchedules.get(i).setSchoolId(vipGroup.getTeacherSchoolId());
 				}
+				newCourseSchedules.get(i).setOrganId(vipGroup.getOrganId());
 			}
 			courseScheduleService.batchAddCourseSchedule(newCourseSchedules);
 
@@ -2363,6 +2365,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			courseSchedule.setGroupType(GroupType.VIP);
 			courseSchedule.setMusicGroupId(vipGroup.getId().toString());
 			courseSchedule.setName(vipGroup.getName());
+			courseSchedule.setOrganId(vipGroup.getOrganId());
 //			if (courseSchedule.getTeachMode().equals(TeachModeEnum.ONLINE)) {
 //				surplusCourseTotalPrice = surplusCourseTotalPrice.add(onlineCoursePrice);
 //			} else if (courseSchedule.getTeachMode().equals(TeachModeEnum.OFFLINE)) {

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

@@ -95,6 +95,7 @@ public class CourseScheduleController extends BaseController {
             courseSchedule.setMusicGroupId(musicGroup.getId());
             courseSchedule.setGroupType(GroupType.MUSIC);
             courseSchedule.setTeachMode(TeachModeEnum.OFFLINE);
+            courseSchedule.setOrganId(musicGroup.getOrganId());
         });
 
         scheduleService.createCourseSchedules(createCourseScheduleDto);