拆班合班

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleDao.java

@@ -1402,6 +1402,17 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
                               @Param("isLock") Integer isLock);
 
     /**
+     * @param classGroupIds:
+     * @param isLock:    冻结状态：1、冻结，0、正常
+     * @return int
+     * @describe 通过班级编号更改课程的冻结状态
+     * @author zouxuan
+     */
+    int batchUpdateLockByClassGroupIds(@Param("classGroupIds") List<Integer> classGroupIds,
+                              @Param("isLock") Integer isLock);
+
+
+    /**
      * 获取当前课程是第几课时
      *
      * @param courseScheduleId

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupDao.java

@@ -316,4 +316,12 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @return com.ym.mec.biz.dal.entity.MusicGroup
      */
     MusicGroup getStuEduMusic(@Param("studentId") Integer studentId, @Param("educationalTeacherId") Integer educationalTeacherId);
+
+    /**
+     * 根据班级编号获取乐团信息
+     * @author zouxuan
+     * @param classGroupId
+     * @return
+     */
+    MusicGroup findByClassGroupId(Integer classGroupId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/OrganizationCourseUnitPriceSettingsDao.java

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dao;
 
 import java.util.List;
+import java.util.Map;
 
 import org.apache.ibatis.annotations.Param;
 
@@ -26,4 +27,13 @@ public interface OrganizationCourseUnitPriceSettingsDao extends BaseDAO<Integer,
 	 * @return
 	 */
 	int batchInsert(List<OrganizationCourseUnitPriceSettings> organizationCourseUnitPriceSettingsList);
+
+	/**
+	 * 根据分部和收费类型获取课程类型，单价map
+	 * @author zouxuan
+	 * @param chargeTypeId
+	 * @param organId
+	 * @return
+	 */
+    List<Map<String, Integer>> queryMapByOrganIdAndChargeTypeId(@Param("chargeTypeId") Integer chargeTypeId, @Param("organId") Integer organId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MergeClassSplitClassAffirmDto.java

@@ -0,0 +1,36 @@
+package com.ym.mec.biz.dal.dto;
+
+
+import java.util.List;
+
+public class MergeClassSplitClassAffirmDto {
+    private List<ClassGroup4MixDto> classGroup4MixDtos;
+
+    private List<MusicGroupPaymentCalenderDto> musicGroupPaymentCalenderDtos;
+
+    private List<Integer> classGroupIds;
+
+    public List<Integer> getClassGroupIds() {
+        return classGroupIds;
+    }
+
+    public void setClassGroupIds(List<Integer> classGroupIds) {
+        this.classGroupIds = classGroupIds;
+    }
+
+    public List<ClassGroup4MixDto> getClassGroup4MixDtos() {
+        return classGroup4MixDtos;
+    }
+
+    public void setClassGroup4MixDtos(List<ClassGroup4MixDto> classGroup4MixDtos) {
+        this.classGroup4MixDtos = classGroup4MixDtos;
+    }
+
+    public List<MusicGroupPaymentCalenderDto> getMusicGroupPaymentCalenderDtos() {
+        return musicGroupPaymentCalenderDtos;
+    }
+
+    public void setMusicGroupPaymentCalenderDtos(List<MusicGroupPaymentCalenderDto> musicGroupPaymentCalenderDtos) {
+        this.musicGroupPaymentCalenderDtos = musicGroupPaymentCalenderDtos;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicGroupPaymentCalenderDto.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PayUserType;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentType;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderCourseSettings;
@@ -32,10 +33,21 @@ public class MusicGroupPaymentCalenderDto {
 	
 	private String batchNo;
 
+	private MusicGroupPaymentCalender.PaymentCalenderStatusEnum status;
+
 	private List<MusicGroupPaymentDateRange> musicGroupPaymentDateRangeList = new ArrayList<MusicGroupPaymentDateRange>();
 
 	private List<MusicGroupPaymentCalenderCourseSettings> musicGroupPaymentCalenderCourseSettingsList = new ArrayList<MusicGroupPaymentCalenderCourseSettings>();
 
+
+	public MusicGroupPaymentCalender.PaymentCalenderStatusEnum getStatus() {
+		return status;
+	}
+
+	public void setStatus(MusicGroupPaymentCalender.PaymentCalenderStatusEnum status) {
+		this.status = status;
+	}
+
 	public String getMusicGroupId() {
 		return musicGroupId;
 	}

mec-biz/src/main/java/com/ym/mec/biz/service/ClassGroupService.java

@@ -472,4 +472,12 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @return
      */
     Map<Integer,Map<String, MusicGroupOrganizationCourseSettingsDetail>> getDefaultPaymentCalender(List<Integer> classGroupIds);
+
+    /**
+     * 进行中乐团-修改-班级详情-学员班级调整-合并结果确认
+     * @author zouxuan
+     * @param mergeClassSplitClassAffirmDto
+     * @return
+     */
+    Object mergeClassSplitClassAffirm(MergeClassSplitClassAffirmDto mergeClassSplitClassAffirmDto);
 }

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.service.impl;
 
+import static com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentCalenderStatusEnum.AUDITING;
 import static com.ym.mec.biz.dal.enums.GroupType.COMM;
 import static com.ym.mec.biz.dal.enums.GroupType.MUSIC;
 import static com.ym.mec.biz.dal.enums.GroupType.PRACTICE;
@@ -27,7 +28,9 @@ import java.util.stream.Collectors;
 
 import com.alibaba.fastjson.JSONArray;
 import com.ym.mec.biz.dal.dao.*;
+import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
+import com.ym.mec.biz.service.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -39,24 +42,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dto.ClassGroup4MixDto;
-import com.ym.mec.biz.dal.dto.ClassGroupImGroupDto;
-import com.ym.mec.biz.dal.dto.ClassGroupTeacherMapDto;
-import com.ym.mec.biz.dal.dto.ClassGroupTeachersDto;
-import com.ym.mec.biz.dal.dto.CourseListDto;
-import com.ym.mec.biz.dal.dto.CourseTimeDto;
-import com.ym.mec.biz.dal.dto.HighClassGroupDto;
-import com.ym.mec.biz.dal.dto.MusicGroupClassGroupDto;
-import com.ym.mec.biz.dal.dto.MusicGroupCourseScheduleDto;
-import com.ym.mec.biz.dal.dto.RemainCourseTypeDurationDto;
-import com.ym.mec.biz.dal.dto.StudentAttendanceViewDto;
-import com.ym.mec.biz.dal.dto.StudentPayInfoDto;
-import com.ym.mec.biz.dal.dto.SuperClassGroupDto;
-import com.ym.mec.biz.dal.dto.TeacherClassGroupDto;
-import com.ym.mec.biz.dal.dto.TeacherClassHeadInfo;
-import com.ym.mec.biz.dal.dto.TeacherMusicClassInfoDto;
-import com.ym.mec.biz.dal.dto.TeacherVipClassInfoDto;
-import com.ym.mec.biz.dal.dto.UserMusicGroupQueryInfo;
 import com.ym.mec.biz.dal.entity.CourseSchedule.CourseScheduleType;
 import com.ym.mec.biz.dal.enums.ClassGroupStudentStatusEnum;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
@@ -76,17 +61,6 @@ import com.ym.mec.biz.dal.page.StudentPayLogQueryInfo;
 import com.ym.mec.biz.dal.page.TeacherMusicClassQueryInfo;
 import com.ym.mec.biz.dal.page.VipClassQueryInfo;
 import com.ym.mec.biz.dal.page.queryMusicGroupCourseScheduleQueryInfo;
-import com.ym.mec.biz.service.ClassGroupRelationService;
-import com.ym.mec.biz.service.ClassGroupService;
-import com.ym.mec.biz.service.ClassGroupTeacherMapperService;
-import com.ym.mec.biz.service.CourseScheduleService;
-import com.ym.mec.biz.service.CourseScheduleStudentPaymentService;
-import com.ym.mec.biz.service.CourseScheduleTeacherSalaryService;
-import com.ym.mec.biz.service.MusicGroupPaymentCalenderCourseSettingsService;
-import com.ym.mec.biz.service.StudentRegistrationService;
-import com.ym.mec.biz.service.SubjectService;
-import com.ym.mec.biz.service.SysConfigService;
-import com.ym.mec.biz.service.TeacherDefaultMusicGroupSalaryService;
 import com.ym.mec.common.constant.CommonConstants;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.ImGroupMember;
@@ -183,9 +157,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @Autowired
     private MusicGroupPaymentCalenderCourseSettingsService musicGroupPaymentCalenderCourseSettingsService;
     @Autowired
-    private MusicGroupOrganizationCourseSettingsDetailDao musicGroupOrganizationCourseSettingsDetailDao;
+    private OrganizationCourseUnitPriceSettingsDao organizationCourseUnitPriceSettingsDao;
     @Autowired
     private MusicGroupPaymentCalenderDao musicGroupPaymentCalenderDao;
+    @Autowired
+    private MusicGroupPaymentCalenderService musicGroupPaymentCalenderService;
 
     @Override
     public BaseDAO<Integer, ClassGroup> getDAO() {
@@ -1790,6 +1766,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         //创建IM群组
         addImGroup(classGroup, userIds);
 
+
         Map<String, Integer> courseTypeMinutesMap = musicGroupPaymentCalenderCourseSettingsService.getMusicCourseSettingsWithStudents(musicGroupId, studentIdList);
 
         //计算每节课的课酬
@@ -1799,6 +1776,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
         for (ClassGroup4MixDto classGroup4MixDto : classGroup4MixDtos) {
+            if(classGroup4MixDto.getCourseTimeDtoList() == null || classGroup4MixDto.getCourseTimeDtoList().size() == 0){
+                break;
+            }
             //5、插入班级排课信息
             LocalDateTime now = LocalDate.parse(classGroup4MixDto.getStartDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd")).atStartOfDay();
 
@@ -1978,14 +1958,17 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             }
         }
 
-        //检测新排课冲突
-        courseScheduleService.checkNewCourseSchedules(courseScheduleList, false);
+        if(courseScheduleList.size() > 0){
+            //检测新排课冲突
+            courseScheduleService.checkNewCourseSchedules(courseScheduleList, false);
+        }
+
         //老师结算表
         if (courseScheduleTeacherSalaryList.size() > 0) {
             courseScheduleTeacherSalaryService.batchInsert(courseScheduleTeacherSalaryList);
         }
         //学生结算表
-        if (!CollectionUtils.isEmpty(studentIdList)) {
+        if (courseScheduleList.size() > 0) {
             courseScheduleStudentPaymentService.createForMusicGroup(musicGroupId, courseScheduleList, studentIdList);
         }
         return classGroup;
@@ -3256,7 +3239,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         JSONObject jsonObject = JSON.parseObject(courseDefaultMinutes);
         //获取所选班级最大剩余课时
         Map<String,Long> map = MapUtil.convertIntegerMap(courseScheduleDao.findClassMaxCourseNumMap(classGroupIds));
-        //获取每个班级对应课程类型最后一节课
+        //获取分布默认的课程类型单价
+        MusicGroup musicGroup = musicGroupDao.findByClassGroupId(classGroupIds.get(0));
+        Map<String,BigDecimal> unitPriceMap = MapUtil.convertIntegerMap(organizationCourseUnitPriceSettingsDao.queryMapByOrganIdAndChargeTypeId(musicGroup.getChargeTypeId(),musicGroup.getOrganId()));
         Set<String> courseTypes = map.keySet();
         for (Integer classGroupId : classGroupIds) {
             Map<String,MusicGroupOrganizationCourseSettingsDetail> courseMap = new HashMap<>();
@@ -3274,15 +3259,69 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 }
                 Long subNum = maxNum - currentNum;
                 //生成缴费项目
-                MusicGroupOrganizationCourseSettingsDetail settingsDetail = musicGroupOrganizationCourseSettingsDetailDao.getClassLastSetting(classGroupId,courseType);
+//                MusicGroupOrganizationCourseSettingsDetail settingsDetail = musicGroupOrganizationCourseSettingsDetailDao.getClassLastSetting(classGroupId,courseType);
+                MusicGroupOrganizationCourseSettingsDetail settingsDetail = new MusicGroupOrganizationCourseSettingsDetail();
+                BigDecimal unitPrice = unitPriceMap.get(courseType);
+                if(unitPrice == null){
+                    throw new BizException("分部默认课程类型单价不存在，请设置");
+                }
                 settingsDetail.setCourseType(CourseScheduleType.valueOf(courseType));
                 settingsDetail.setCourseTotalMinuties(Integer.parseInt(jsonObject.get(courseType).toString()) * subNum.intValue());
-                settingsDetail.setCourseCurrentPrice(settingsDetail.getCourseCurrentPrice().multiply(new BigDecimal(subNum)));
-                settingsDetail.setCourseOriginalPrice(settingsDetail.getCourseOriginalPrice().multiply(new BigDecimal(subNum)));
+                settingsDetail.setCourseCurrentPrice(unitPrice.multiply(new BigDecimal(subNum)).multiply(new BigDecimal(settingsDetail.getCourseTotalMinuties())));
+                settingsDetail.setCourseOriginalPrice(settingsDetail.getCourseCurrentPrice());
                 courseMap.put(courseType,settingsDetail);
             }
             resultMap.put(classGroupId,courseMap);
         }
         return resultMap;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Object mergeClassSplitClassAffirm(MergeClassSplitClassAffirmDto mergeClassSplitClassAffirmDto) {
+        List<Integer> classGroupIds = mergeClassSplitClassAffirmDto.getClassGroupIds();
+        if(classGroupIds == null || classGroupIds.size() == 0){
+            throw new BizException("参数校验失败");
+        }
+        MusicGroup musicGroup = musicGroupDao.findByClassGroupId(classGroupIds.get(0));
+        //生成缴费记录
+        List<MusicGroupPaymentCalenderDto> paymentCalenderDtos = mergeClassSplitClassAffirmDto.getMusicGroupPaymentCalenderDtos();
+        if(paymentCalenderDtos != null && paymentCalenderDtos.size() > 0){
+            MusicGroupPaymentCalender.PaymentCalenderStatusEnum status = null;
+            for (MusicGroupPaymentCalenderDto calenderDto : paymentCalenderDtos) {
+                if(status != null && status != AUDITING){
+                    List<MusicGroupPaymentCalenderCourseSettings> musicGroupPaymentCalenderCourseSettingsList = calenderDto.getMusicGroupPaymentCalenderCourseSettingsList();
+                    for (MusicGroupPaymentCalenderCourseSettings courseSettings : musicGroupPaymentCalenderCourseSettingsList) {
+                        OrganizationCourseUnitPriceSettings defaultUnitPrice = organizationCourseUnitPriceSettingsDao.queryByOrganIdAndCourseTypeAndChargeType(
+                                musicGroup.getOrganId(), courseSettings.getCourseType(), musicGroup.getChargeTypeId());
+                        if (defaultUnitPrice == null) {
+                            throw new BizException("请先设置分部课程类型单价");
+                        }
+                        if (courseSettings.getCourseCurrentPrice()
+                                .divide(new BigDecimal(courseSettings.getCourseTotalMinuties()), CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_DOWN)
+                                .compareTo(defaultUnitPrice.getUnitPrice()) != 0) {
+                            status = AUDITING;
+                            break;
+                        }
+                    }
+                }
+            }
+            for (MusicGroupPaymentCalenderDto calenderDto : paymentCalenderDtos) {
+                if(status != null && status == AUDITING){
+                    calenderDto.setStatus(AUDITING);
+                }
+                musicGroupPaymentCalenderService.create(calenderDto);
+            }
+        }
+        //新增班级
+        List<ClassGroup4MixDto> classGroup4MixDtos = mergeClassSplitClassAffirmDto.getClassGroup4MixDtos();
+        if(CollectionUtils.isEmpty(classGroup4MixDtos)){
+            throw new BizException("请填写班级信息");
+        }
+        classGroupService.classGroupAdjust(classGroup4MixDtos);
+        //冻结所选班级的课程
+        courseScheduleDao.batchUpdateLockByClassGroupIds(classGroupIds,1);
+        //保存学员应该增加的课程时长
+        return null;
+    }
 }

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.service.impl;
 
 import static com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PayUserType.SCHOOL;
 import static com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PayUserType.STUDENT;
+import static com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentCalenderStatusEnum.AUDITING;
 import static com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentType.ADD_STUDENT;
 import static com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentType.MUSIC_APPLY;
 import static com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentType.MUSIC_RENEW;
@@ -188,7 +189,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		}
 
 		if (payUserType == SCHOOL) {
-			status = PaymentCalenderStatusEnum.AUDITING;
+			status = AUDITING;
 		} else {
 			if (paymentType == MUSIC_APPLY || paymentType == MUSIC_RENEW) {
 				// 当前缴费的课程费用
@@ -208,23 +209,28 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 				// 相同类型的课程如果修改了课程费用，需要走审批
 				for (Entry<CourseScheduleType, BigDecimal> entry : currentCoursePrice.entrySet()) {
 					if (defaultCoursePrice.get(entry.getKey()).compareTo(entry.getValue()) != 0) {
-						status = PaymentCalenderStatusEnum.AUDITING;
+						status = AUDITING;
 						break;
 					}
 				}
 			} else if (paymentType == PaymentType.ADD_COURSE || paymentType == PaymentType.ADD_STUDENT) {
-				// 如果是临时加课，是否审核是根据单价判断
-				for (MusicGroupPaymentCalenderCourseSettings courseSettings : musicGroupPaymentCalenderCourseSettingsList) {
-					OrganizationCourseUnitPriceSettings defaultUnitPrice = organizationCourseUnitPriceSettingsDao.queryByOrganIdAndCourseTypeAndChargeType(
-							musicGroup.getOrganId(), courseSettings.getCourseType(), musicGroup.getChargeTypeId());
-					if (defaultUnitPrice == null) {
-						throw new BizException("请先设置分部课程类型单价");
-					}
-					if (courseSettings.getCourseCurrentPrice()
-							.divide(new BigDecimal(courseSettings.getCourseTotalMinuties()), CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_DOWN)
-							.compareTo(defaultUnitPrice.getUnitPrice()) != 0) {
-						status = PaymentCalenderStatusEnum.AUDITING;
-						break;
+				PaymentCalenderStatusEnum dtoStatus = musicGroupPaymentCalenderDto.getStatus();
+				if(dtoStatus != null && dtoStatus == AUDITING){
+					status = AUDITING;
+				}else {
+					// 如果是临时加课，是否审核是根据单价判断
+					for (MusicGroupPaymentCalenderCourseSettings courseSettings : musicGroupPaymentCalenderCourseSettingsList) {
+						OrganizationCourseUnitPriceSettings defaultUnitPrice = organizationCourseUnitPriceSettingsDao.queryByOrganIdAndCourseTypeAndChargeType(
+								musicGroup.getOrganId(), courseSettings.getCourseType(), musicGroup.getChargeTypeId());
+						if (defaultUnitPrice == null) {
+							throw new BizException("请先设置分部课程类型单价");
+						}
+						if (courseSettings.getCourseCurrentPrice()
+								.divide(new BigDecimal(courseSettings.getCourseTotalMinuties()), CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_DOWN)
+								.compareTo(defaultUnitPrice.getUnitPrice()) != 0) {
+							status = AUDITING;
+							break;
+						}
 					}
 				}
 			}
@@ -306,11 +312,11 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			if (paymentType == PaymentType.ADD_STUDENT) {
 				musicGroupPaymentCalender.setPayUserType(STUDENT);
 				musicGroupPaymentCalender.setIsGiveMusicNetwork(false);
-				if (musicGroupPaymentCalender.getStatus() != PaymentCalenderStatusEnum.AUDITING) {
+				if (musicGroupPaymentCalender.getStatus() != AUDITING) {
 					musicGroupPaymentCalender.setExpectNum(1);
 				}
 			}
-			if (musicGroupPaymentCalender.getStatus() != PaymentCalenderStatusEnum.AUDITING) {
+			if (musicGroupPaymentCalender.getStatus() != AUDITING) {
 				if (date.after(musicGroupPaymentCalender.getStartPaymentDate())) {
 					musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.OPEN);
 				} else if (date.after(musicGroupPaymentCalender.getDeadlinePaymentDate())) {
@@ -329,7 +335,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			List<MusicGroupPaymentCalenderCourseSettings> currentMusicGroupPaymentCalenderCourseSettings = musicGroupPaymentCalender
 					.getMusicGroupPaymentCalenderCourseSettingsList();
 
-			if (musicGroupPaymentCalender.getStatus() != PaymentCalenderStatusEnum.AUDITING) {
+			if (musicGroupPaymentCalender.getStatus() != AUDITING) {
 				// 如果是进行中加学生
 				if (musicGroupPaymentCalender.getPaymentType() == PaymentType.ADD_STUDENT) {
 					addStudent(musicGroupPaymentCalender, currentMusicGroupPaymentCalenderCourseSettings);
@@ -356,7 +362,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 				if (musicGroup.getStatus() != MusicGroupStatusEnum.DRAFT) {
 					throw new BizException("创建失败：缴费项目类型不匹配");
 				}
-				if (status != PaymentCalenderStatusEnum.AUDITING) {
+				if (status != AUDITING) {
 					musicGroup.setStatus(MusicGroupStatusEnum.AUDIT);
 					// 记录操作日志
 					musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "报名缴费项目创建成功（草稿 -> 基础信息审核中）", sysUser.getId(), ""));
@@ -370,7 +376,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			}
 		}
 
-		if (status == PaymentCalenderStatusEnum.AUDITING) {
+		if (status == AUDITING) {
 			// 如果是审核中
 			Set<Integer> roleIds = new HashSet<>(1);
 			roleIds.add(SysUserRole.ADMINISTRATOR);
@@ -464,7 +470,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		}
 
 		if (payUserType == SCHOOL) {
-			status = PaymentCalenderStatusEnum.AUDITING;
+			status = AUDITING;
 		} else {
 			if (paymentType == MUSIC_APPLY || paymentType == MUSIC_RENEW) {
 				// 当前缴费的课程费用
@@ -484,7 +490,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 				// 相同类型的课程如果修改了课程费用，需要走审批
 				for (Entry<CourseScheduleType, BigDecimal> entry : currentCoursePrice.entrySet()) {
 					if (defaultCoursePrice.get(entry.getKey()).compareTo(entry.getValue()) != 0) {
-						status = PaymentCalenderStatusEnum.AUDITING;
+						status = AUDITING;
 						break;
 					}
 				}
@@ -499,7 +505,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 					if (courseSettings.getCourseCurrentPrice()
 							.divide(new BigDecimal(courseSettings.getCourseTotalMinuties()), CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_DOWN)
 							.compareTo(defaultUnitPrice.getUnitPrice()) != 0) {
-						status = PaymentCalenderStatusEnum.AUDITING;
+						status = AUDITING;
 						break;
 					}
 				}
@@ -582,11 +588,11 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			if (paymentType == PaymentType.ADD_STUDENT) {
 				musicGroupPaymentCalender.setPayUserType(STUDENT);
 				musicGroupPaymentCalender.setIsGiveMusicNetwork(false);
-				if (musicGroupPaymentCalender.getStatus() != PaymentCalenderStatusEnum.AUDITING) {
+				if (musicGroupPaymentCalender.getStatus() != AUDITING) {
 					musicGroupPaymentCalender.setExpectNum(1);
 				}
 			}
-			if (musicGroupPaymentCalender.getStatus() != PaymentCalenderStatusEnum.AUDITING) {
+			if (musicGroupPaymentCalender.getStatus() != AUDITING) {
 				if (date.after(musicGroupPaymentCalender.getStartPaymentDate())) {
 					musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.OPEN);
 				} else if (date.after(musicGroupPaymentCalender.getDeadlinePaymentDate())) {
@@ -605,7 +611,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			List<MusicGroupPaymentCalenderCourseSettings> currentMusicGroupPaymentCalenderCourseSettings = musicGroupPaymentCalender
 					.getMusicGroupPaymentCalenderCourseSettingsList();
 
-			if (musicGroupPaymentCalender.getStatus() != PaymentCalenderStatusEnum.AUDITING) {
+			if (musicGroupPaymentCalender.getStatus() != AUDITING) {
 				// 如果是进行中加学生
 				if (musicGroupPaymentCalender.getPaymentType() == PaymentType.ADD_STUDENT) {
 					addStudent(musicGroupPaymentCalender, currentMusicGroupPaymentCalenderCourseSettings);
@@ -632,7 +638,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 				if (musicGroup.getStatus() != MusicGroupStatusEnum.DRAFT) {
 					throw new BizException("创建失败：缴费项目类型不匹配");
 				}
-				if (status != PaymentCalenderStatusEnum.AUDITING) {
+				if (status != AUDITING) {
 					musicGroup.setStatus(MusicGroupStatusEnum.AUDIT);
 					// 记录操作日志
 					musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "报名缴费项目创建成功（草稿 -> 基础信息审核中）", sysUser.getId(), ""));
@@ -646,7 +652,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			}
 		}
 
-		if (status == PaymentCalenderStatusEnum.AUDITING) {
+		if (status == AUDITING) {
 			// 如果是审核中
 			Set<Integer> roleIds = new HashSet<>(1);
 			roleIds.add(SysUserRole.ADMINISTRATOR);

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

@@ -1310,6 +1310,16 @@
           AND NOW() < CONCAT(class_date_, " ", start_class_time_);
     </update>
 
+    <update id="batchUpdateLockByClassGroupIds">
+        UPDATE course_schedule
+        SET is_lock_ = #{isLock}, update_time_ = NOW()
+        WHERE class_group_id_ IN
+        <foreach collection="classGroupIds" open="(" close=")" item="item" separator=",">
+            #{item}
+        </foreach>
+        AND NOW() &lt; CONCAT(class_date_, " ", start_class_time_)
+    </update>
+
     <select id="queryNoSignInListByBeforeMinutes" resultMap="CourseSchedule">
         SELECT cs.*
         FROM course_schedule cs

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

@@ -619,4 +619,9 @@
         WHERE mg.status_ != 'CANCELED' AND sr.music_group_status_ != 'QUIT'
         AND sr.user_id_ = #{studentId} AND mg.educational_teacher_id_ = #{educationalTeacherId} LIMIT 1
     </select>
+    <select id="findByClassGroupId" resultMap="MusicGroup">
+        SELECT mg.* FROM music_group mg
+		LEFT JOIN class_group cg ON cg.music_group_id_ = mg.id_
+		WHERE cg.id_ = #{classGroupId} LIMIT 1
+    </select>
 </mapper>

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

@@ -116,4 +116,9 @@
 		SELECT * FROM organization_course_unit_price_settings WHERE organ_id_ = #{organId} and course_type_ = #{courseScheduleType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 		and charge_type_id_ = #{chargeTypeId}
 	</select>
+    <select id="queryMapByOrganIdAndChargeTypeId" resultType="java.util.Map">
+		SELECT course_type_ 'key',MAX(unit_price_)'value' FROM organization_course_unit_price_settings
+		WHERE organ_id_ = #{organId} AND charge_type_id_ = #{chargeTypeId}
+		GROUP BY course_type_
+	</select>
 </mapper>

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

@@ -1,5 +1,6 @@
 package com.ym.mec.web.controller;
 
+import com.ym.mec.biz.dal.dto.MergeClassSplitClassAffirmDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -347,4 +348,11 @@ public class ClassGroupController extends BaseController {
     public HttpResponseResult studentClassAuditDetail(@RequestBody List<Integer> classGroupIds){
         return succeed(classGroupService.getDefaultPaymentCalender(classGroupIds));
     }
+
+    @ApiOperation(value = "进行中乐团-修改-班级详情-学员班级调整-合并结果确认")
+    @PostMapping("/mergeClassSplitClassAffirm")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/mergeClassSplitClassAffirm')")
+    public HttpResponseResult mergeClassSplitClassAffirm(@RequestBody MergeClassSplitClassAffirmDto mergeClassSplitClassAffirmDto){
+        return succeed(classGroupService.mergeClassSplitClassAffirm(mergeClassSplitClassAffirmDto));
+    }
 }