|
@@ -29,6 +29,7 @@ import java.util.TreeSet;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Stream;
|
|
import java.util.stream.Stream;
|
|
|
|
|
|
|
|
+import com.ym.mec.biz.dal.enums.*;
|
|
import org.apache.commons.collections.ListUtils;
|
|
import org.apache.commons.collections.ListUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
@@ -120,20 +121,6 @@ import com.ym.mec.biz.dal.entity.TeacherDefaultMusicGroupSalary;
|
|
import com.ym.mec.biz.dal.entity.TeacherDefaultPracticeGroupSalary;
|
|
import com.ym.mec.biz.dal.entity.TeacherDefaultPracticeGroupSalary;
|
|
import com.ym.mec.biz.dal.entity.TeacherDefaultVipGroupSalary;
|
|
import com.ym.mec.biz.dal.entity.TeacherDefaultVipGroupSalary;
|
|
import com.ym.mec.biz.dal.entity.VipGroup;
|
|
import com.ym.mec.biz.dal.entity.VipGroup;
|
|
-import com.ym.mec.biz.dal.enums.AuditStatusEnum;
|
|
|
|
-import com.ym.mec.biz.dal.enums.ClassGroupStudentStatusEnum;
|
|
|
|
-import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
|
|
|
|
-import com.ym.mec.biz.dal.enums.CourseStatusEnum;
|
|
|
|
-import com.ym.mec.biz.dal.enums.GroupType;
|
|
|
|
-import com.ym.mec.biz.dal.enums.MessageTypeEnum;
|
|
|
|
-import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
|
|
|
|
-import com.ym.mec.biz.dal.enums.ParamEnum;
|
|
|
|
-import com.ym.mec.biz.dal.enums.SalarySettlementTypeEnum;
|
|
|
|
-import com.ym.mec.biz.dal.enums.StudentAttendanceStatusEnum;
|
|
|
|
-import com.ym.mec.biz.dal.enums.TeachModeEnum;
|
|
|
|
-import com.ym.mec.biz.dal.enums.TeachTypeEnum;
|
|
|
|
-import com.ym.mec.biz.dal.enums.VipGroupStatusEnum;
|
|
|
|
-import com.ym.mec.biz.dal.enums.YesOrNoEnum;
|
|
|
|
import com.ym.mec.biz.dal.page.CourseScheduleQueryInfo;
|
|
import com.ym.mec.biz.dal.page.CourseScheduleQueryInfo;
|
|
import com.ym.mec.biz.dal.page.EndCourseScheduleQueryInfo;
|
|
import com.ym.mec.biz.dal.page.EndCourseScheduleQueryInfo;
|
|
import com.ym.mec.biz.dal.page.StudentCourseScheduleRecordQueryInfo;
|
|
import com.ym.mec.biz.dal.page.StudentCourseScheduleRecordQueryInfo;
|
|
@@ -522,6 +509,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
if(Objects.isNull(practiceGroup)){
|
|
if(Objects.isNull(practiceGroup)){
|
|
throw new BizException("找不到网管课信息");
|
|
throw new BizException("找不到网管课信息");
|
|
}
|
|
}
|
|
|
|
+ if(!GroupStatusEnum.NORMAL.equals(practiceGroup.getGroupStatus())){
|
|
|
|
+ throw new BizException("非进行中网管课不支持加课");
|
|
|
|
+ }
|
|
organId=practiceGroup.getOrganId();
|
|
organId=practiceGroup.getOrganId();
|
|
|
|
|
|
List<TeacherDefaultPracticeGroupSalary> teacherDefaultPracticeGroupSalaryList = teacherDefaultPracticeGroupSalaryDao
|
|
List<TeacherDefaultPracticeGroupSalary> teacherDefaultPracticeGroupSalaryList = teacherDefaultPracticeGroupSalaryDao
|