Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -2002,6 +2002,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 currentClassTimes+=1;
             }
         }
+
         classGroup.setTotalClassTimes(totalClassTimes);
         classGroup.setCurrentClassTimes(currentClassTimes);
         Integer studentNum = classGroupStudentMapperDao.countClassGroupStudentNum(classGroupId);

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

@@ -709,28 +709,22 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		errInfo.append("安排的课程存在冲突,");
 		errInfo.append("冲突课程为：");
 
-		String groupId="";
-		CourseSchedule.CourseScheduleType courseType=CourseSchedule.CourseScheduleType.VIP;
 		CourseSchedule courseSchedule=new CourseSchedule();
 		if(Objects.nonNull(preCourseSchedule.getId())&&existCourseScheduleIds.contains(preCourseSchedule.getId())){
-			groupId=preCourseSchedule.getMusicGroupId();
-			courseType=preCourseSchedule.getType();
             courseSchedule=preCourseSchedule;
 		}
 		if(Objects.nonNull(backCourseSchedule.getId())&&existCourseScheduleIds.contains(backCourseSchedule.getId())){
-			groupId=backCourseSchedule.getMusicGroupId();
-			courseType=preCourseSchedule.getType();
 			courseSchedule=backCourseSchedule;
 		}
 
 		String groupName="";
-		if(courseType.equals(CourseSchedule.CourseScheduleType.VIP)){
-			VipGroup vipGroup=vipGroupDao.get(Long.valueOf(groupId));
+		if(courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.VIP)){
+			VipGroup vipGroup=vipGroupDao.get(Long.valueOf(courseSchedule.getMusicGroupId()));
 			if(Objects.nonNull(vipGroup)){
 				groupName=vipGroup.getName();
 			}
 		}else{
-			MusicGroup musicGroup = musicGroupDao.get(groupId);
+			MusicGroup musicGroup = musicGroupDao.get(courseSchedule.getMusicGroupId());
 			if(Objects.nonNull(musicGroup)){
 				groupName=musicGroup.getName();
 			}
@@ -738,7 +732,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 		errInfo.append(groupName);
 		errInfo.append("(");
-		errInfo.append(groupId);
+		errInfo.append(courseSchedule.getMusicGroupId());
 		errInfo.append(")-");
 		errInfo.append(courseSchedule.getName());
 		errInfo.append("(");
@@ -870,6 +864,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			throw new BizException("指定课程不存在");
 		}
 
+		int courseNum = courseScheduleDao.countVipGroupCourses(vipGroup.getId().intValue());
+		if(courseNum==0){
+			throw new BizException("未排课的课程不能进行调整");
+		}
+
 		ClassGroup classGroup=classGroupDao.findByGroupAndType(vipGroupCourseAdjustInfo.getVipGroupId().toString(),GroupType.VIP.getCode());
 		if(Objects.isNull(classGroup)){
 			throw new BizException("对应班级不存在");

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

@@ -1836,6 +1836,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 		vipGroup.setStatus(VipGroupStatusEnum.PROGRESS);
 		vipGroupDao.update(vipGroup);
+		classGroup.setDelFlag(0);
+		classGroupDao.update(classGroup);
 		classGroupService.updateClassGroupInfo(classGroup.getId());
 
 		try {