活动排课

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

@@ -70,6 +70,8 @@ public class VipGroupManageController extends BaseController {
     private ClassGroupStudentMapperDao classGroupStudentMapperDao;
     @Autowired
     private CourseScheduleDao courseScheduleDao;
+    @Autowired
+    private VipGroupCategoryDao vipGroupCategoryDao;
 
     @GetMapping("/teacherSalarySettlement")
     public Object teacherSalarySettlement(){
@@ -94,7 +96,8 @@ public class VipGroupManageController extends BaseController {
         if(Objects.isNull(classGroup)){
             throw new BizException("课程信息错误");
         }
-        if(Objects.isNull(oldVipGroup.getVipGroupActivityId())){
+        VipGroupCategory vipGroupCategory = vipGroupCategoryDao.get(oldVipGroup.getVipGroupCategoryId());
+        if(vipGroupCategory != null && vipGroupCategory.getMusicTheory()){
             if(VipGroupStatusEnum.PROGRESS.equals(vipGroup.getStatus())&&!VipGroupStatusEnum.FINISHED.equals(oldVipGroup.getStatus())&&oldVipGroup.getStatus().getCode()>VipGroupStatusEnum.PROGRESS.getCode()){
                 throw new BizException("此课程组状态暂不支持修改");
             }