课程转换

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ClassGroupDto.java

@@ -60,9 +60,9 @@ public class ClassGroupDto extends BaseEntity {
 	private Integer studentNum;
 
 	/** 班级类型(普通班级、合奏班级) */
-	@ApiModelProperty(value = "班级类型(普通班级、合奏班级、提高课班级、VIP班级、试听课)", required = true)
-	@NotNull(message = "班级类型不能为空")
-	private ClassGroupTypeEnum type;
+	@ApiModelProperty(value = "课程类型", required = true)
+	@NotNull(message = "课程类型不能为空")
+	private CourseSchedule.CourseScheduleType type;
 
 	@ApiModelProperty(value = "班级老师设置", required = true)
 	private List<ClassGroupTeacherMapper> classGroupTeacherMapperList;
@@ -215,11 +215,11 @@ public class ClassGroupDto extends BaseEntity {
 		this.expectStudentNum = expectStudentNum;
 	}
 
-	public ClassGroupTypeEnum getType() {
+	public CourseSchedule.CourseScheduleType getType() {
 		return type;
 	}
 
-	public void setType(ClassGroupTypeEnum type) {
+	public void setType(CourseSchedule.CourseScheduleType type) {
 		this.type = type;
 	}
 

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

@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.support.lob.LobCreator;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
@@ -75,6 +76,7 @@ public class CourseScheduleConvertServiceImpl implements CourseScheduleConvertSe
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public HttpResponseResult action(List<ClassGroupDto> classGroups) {
         //校验课程是否可以进行转换
         this.checkConvertCourseIds(classGroups.get(0).getCourseIds());
@@ -114,6 +116,7 @@ public class CourseScheduleConvertServiceImpl implements CourseScheduleConvertSe
                     courseScheduleTeacherSalaryList.addAll(groupDto.getCourseScheduleTeacherSalaryList());
                     courseScheduleStudentPayments.addAll(groupDto.getCourseScheduleStudentPayments());
                 }else {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return result;
                 }
             }

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

@@ -58,6 +58,7 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static com.ym.mec.biz.dal.entity.CourseSchedule.CourseScheduleType.MIX;
+import static com.ym.mec.biz.dal.entity.CourseSchedule.CourseScheduleType.MUSIC_NETWORK;
 import static com.ym.mec.biz.dal.enums.ClassGroupTypeEnum.HIGH_ONLINE;
 import static com.ym.mec.biz.dal.enums.GroupType.*;
 import static com.ym.mec.biz.dal.enums.MusicGroupStatusEnum.PROGRESS;
@@ -5843,12 +5844,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		Date date = new Date();
 		Integer classGroupId = groupDto.getClassGroupId();
 		String musicGroupId = groupDto.getMusicGroupId();
-		ClassGroupTypeEnum type = groupDto.getType();
+		CourseScheduleType type = groupDto.getType();
 		List<CourseTimeDto> courseTimeDtoList = groupDto.getCourseTimeDtoList();
 		MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
 
 		TeachModeEnum teachMode = TeachModeEnum.OFFLINE;
-		if (type.equals(HIGH_ONLINE) || type.equals(ClassGroupTypeEnum.MUSIC_NETWORK)) {
+		if (type.equals(CourseScheduleType.HIGH_ONLINE) || type.equals(MUSIC_NETWORK)) {
 			teachMode = TeachModeEnum.ONLINE;
 		}
 		if (CollectionUtils.isEmpty(courseTimeDtoList)) {
@@ -5973,13 +5974,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				courseSchedule.setUpdateTime(date);
 				courseSchedule.setTeachMode(teachMode);
 				courseSchedule.setMusicGroupId(musicGroupId);
-				courseSchedule.setType(courseConvertSumDto.getCourseType());
+				courseSchedule.setType(groupDto.getType());
 				courseSchedule.setName(subjectNames + "-" + courseConvertSumDto.getCourseType().getMsg());
-				courseSchedule.setGroupType(MUSIC);
+				courseSchedule.setGroupType(groupDto.getGroupType());
 				courseSchedule.setTeacherId(teacherId);
 				courseSchedule.setActualTeacherId(teacherId);
 				courseSchedule.setOrganId(musicGroup.getOrganId());
-				courseSchedule.setClassGroupType(groupDto.getType().getCode());
 				courseSchedule.setConvertFlag(groupDto.getConvertFlag());
 				courseScheduleDao.insert(courseSchedule);
 				courseScheduleList.add(courseSchedule);

mec-biz/src/main/resources/config/mybatis/CourseScheduleConvert.xml

@@ -25,7 +25,8 @@
         <result property="courseMinute" column="minute_"/>
     </resultMap>
     <select id="sumCourseConvert" resultMap="CourseConvertSumDto">
-        select COUNT(distinct cs.id_) courseNum,cs.type_ courseType,cssp.num_,SUM(TIMESTAMPDIFF(MINUTE,cs.start_class_time_,cs.end_class_time_)) minute_ from course_schedule cs,
+        select COUNT(distinct cs.id_) courseNum,cs.type_ courseType,cssp.num_,SUM(TIMESTAMPDIFF(MINUTE,cs.start_class_time_,cs.end_class_time_)) minute_
+        from course_schedule cs,
         (select COUNT(distinct cssp.user_id_) num_ from course_schedule_student_payment cssp
         where FIND_IN_SET(cssp.course_schedule_id_,#{courseIds})) cssp
         where FIND_IN_SET(cs.id_,#{courseIds})