Merge remote-tracking branch 'origin/master'

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

@@ -15,6 +15,16 @@ public class MergeClassSplitClassAffirmDto {
 
     private List<Map<Integer,String>> classGroupStudents;
 
+    private Map<String,Long> classCourseMinuteMap;
+
+    public Map<String, Long> getClassCourseMinuteMap() {
+        return classCourseMinuteMap;
+    }
+
+    public void setClassCourseMinuteMap(Map<String, Long> classCourseMinuteMap) {
+        this.classCourseMinuteMap = classCourseMinuteMap;
+    }
+
     public List<Map<Integer, String>> getClassGroupStudents() {
         return classGroupStudents;
     }

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

@@ -28,6 +28,9 @@ public class MusicGroupStudentClassAdjust {
 	@ApiModelProperty(value = "班级可排课时长", required = false)
 	private String classCourseMinute;
 
+	@ApiModelProperty(value = "老师选择的每种类型的排课时长", required = false)
+	private String defaultCourseTypeMinute;
+
 	@ApiModelProperty(value = "所有冻结的课程列表", required = false)
 	private String allLockCourseIds;
 
@@ -46,6 +49,14 @@ public class MusicGroupStudentClassAdjust {
 
 	private Date updateTime;
 
+	public String getDefaultCourseTypeMinute() {
+		return defaultCourseTypeMinute;
+	}
+
+	public void setDefaultCourseTypeMinute(String defaultCourseTypeMinute) {
+		this.defaultCourseTypeMinute = defaultCourseTypeMinute;
+	}
+
 	public String getClassGroupStudents() {
 		return classGroupStudents;
 	}

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

@@ -18,6 +18,7 @@ import com.ym.mec.common.service.BaseService;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
 	
@@ -472,7 +473,7 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @param classGroupIds
      * @return
      */
-    Map<Integer,Map<String, MusicGroupOrganizationCourseSettingsDetail>> getDefaultPaymentCalender(List<Integer> classGroupIds);
+    Map<String,Object> getDefaultPaymentCalender(List<Integer> classGroupIds);
 
     /**
      * 进行中乐团-修改-班级详情-学员班级调整-合并结果确认
@@ -489,5 +490,5 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @param classGroupIds
      * @return
      */
-    Map<String,Long> findClassCourseMinuteMap(List<Integer> classGroupIds);
+    Map<String,Long> findClassCourseMinuteMap(List<Integer> classGroupIds,Map<String,Long> classCourseMinuteMap);
 }

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

@@ -1985,7 +1985,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public List<CourseSchedule> getCourseSchedules(ClassGroup4MixDto classGroup4MixDto,List<CourseSchedule> courseScheduleList){
+    public List<CourseSchedule> getCourseSchedules(ClassGroup4MixDto classGroup4MixDto,List<CourseSchedule> courseScheduleList,MusicGroupStudentClassAdjust classAdjust){
         Date date = new Date();
         String musicGroupId = classGroup4MixDto.getMusicGroupId();
         MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
@@ -2014,8 +2014,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         String classCourseMinute = classGroup4MixDto.getClassCourseMinute();
         LocalDateTime now = LocalDate.parse(classGroup4MixDto.getStartDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd")).atStartOfDay();
         //获取默认的排课时长
-        String courseDefaultMinutes = sysConfigDao.findConfigValue("music_course_default_minutes");
-        JSONObject jsonObject = JSON.parseObject(courseDefaultMinutes);
+        JSONObject jsonObject = JSON.parseObject(classAdjust.getDefaultCourseTypeMinute());
+
+//        String courseDefaultMinutes = sysConfigDao.findConfigValue("music_course_default_minutes");
+//        JSONObject jsonObject = JSON.parseObject(courseDefaultMinutes);
         long classCourseDuration = Integer.parseInt(jsonObject.get(classGroup4MixDto.getCourseType().getCode()).toString());
 //
         Map<String, Integer> classCourseMinuteMap = JSON.parseObject(classCourseMinute, Map.class);
@@ -2125,15 +2127,15 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public List<CourseSchedule> autoAdjust(ClassGroup4MixDto classGroup4MixDto,List<CourseSchedule> courseScheduleList){
+    public List<CourseSchedule> autoAdjust(ClassGroup4MixDto classGroup4MixDto,List<CourseSchedule> courseScheduleList,MusicGroupStudentClassAdjust classAdjust){
         Boolean checkFlag = courseScheduleService.checkNewCourseSchedules(courseScheduleList, false, true);
         if(!checkFlag){
             //排课开始时间加一周
             Date stringToDate = DateUtil.stringToDate(classGroup4MixDto.getStartDate(), DateUtil.ISO_EXPANDED_DATE_FORMAT);
             classGroup4MixDto.setStartDate(DateUtil.format(DateUtil.addDays(stringToDate, 7),DateUtil.ISO_EXPANDED_DATE_FORMAT));
             //再次尝试排课
-            courseScheduleList = getCourseSchedules(classGroup4MixDto,courseScheduleList);
-            autoAdjust(classGroup4MixDto,courseScheduleList);
+            courseScheduleList = getCourseSchedules(classGroup4MixDto,courseScheduleList,classAdjust);
+            autoAdjust(classGroup4MixDto,courseScheduleList,classAdjust);
         }
         return courseScheduleList;
     }
@@ -2160,9 +2162,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
         List<ClassGroupTeacherMapper> classGroupTeacherMapperList = classGroup4MixDto.getClassGroupTeacherMapperList();
 
+        MusicGroupStudentClassAdjust classAdjust = musicGroupStudentClassAdjustDao.get(classGroup4MixDto.getMusicGroupStudentClassAdjustId());
         //获取默认的排课时长
-        String courseDefaultMinutes = sysConfigDao.findConfigValue("music_course_default_minutes");
-        JSONObject jsonObject = JSON.parseObject(courseDefaultMinutes);
+//        String courseDefaultMinutes = sysConfigDao.findConfigValue("music_course_default_minutes");
+        JSONObject jsonObject = JSON.parseObject(classAdjust.getDefaultCourseTypeMinute());
         long classCourseDuration = Integer.parseInt(jsonObject.get(classGroup4MixDto.getCourseType().getCode()).toString());
         ClassGroup classGroup = classGroup4MixDto.getClassGroup();
         if(classGroup == null){
@@ -2204,12 +2207,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         }
         //排课
         List<CourseSchedule> courseScheduleList = new ArrayList<>();
-        getCourseSchedules(classGroup4MixDto,courseScheduleList);
+        getCourseSchedules(classGroup4MixDto,courseScheduleList,classAdjust);
 
         //自动排课，校验冲突
         if(courseScheduleList.size() > 0){
             //冲突校验
-            courseScheduleList = autoAdjust(classGroup4MixDto,courseScheduleList);
+            courseScheduleList = autoAdjust(classGroup4MixDto,courseScheduleList,classAdjust);
 
             List<Integer> allTeacherIds = classGroupTeacherMapperList.stream()
                     .map(ClassGroupTeacherMapper::getUserId)
@@ -3585,20 +3588,23 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     }
 
     @Override
-    public Map<Integer,Map<String,MusicGroupOrganizationCourseSettingsDetail>> getDefaultPaymentCalender(List<Integer> classGroupIds) {
+    public Map<String,Object> getDefaultPaymentCalender(List<Integer> classGroupIds) {
         if(classGroupIds == null || classGroupIds.size() == 0){
             throw new BizException("参数校验失败");
         }
+        Map<String,Object> result = new HashMap<>();
         Map<Integer,Map<String,MusicGroupOrganizationCourseSettingsDetail>> resultMap = new HashMap<>();
         //获取默认的排课时长
-        String courseDefaultMinutes = sysConfigDao.findConfigValue("music_course_default_minutes");
-        JSONObject jsonObject = JSON.parseObject(courseDefaultMinutes);
+//        JSONObject jsonObject = JSON.parseObject(classAdjust.getDefaultCourseTypeMinute());
+//        String courseDefaultMinutes = sysConfigDao.findConfigValue("music_course_default_minutes");
+//        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();
+        Set<String> groupType = new HashSet<>();
         for (Integer classGroupId : classGroupIds) {
             Map<String,MusicGroupOrganizationCourseSettingsDetail> courseMap = new HashMap<>();
             //获取当前班级剩余课次
@@ -3613,6 +3619,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 if(currentNum >= maxNum){
                     continue;
                 }
+                groupType.add(courseType);
                 Long subNum = maxNum - currentNum;
                 //生成缴费项目
                 MusicGroupOrganizationCourseSettingsDetail settingsDetail = new MusicGroupOrganizationCourseSettingsDetail();
@@ -3622,14 +3629,17 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 }
                 settingsDetail.setCourseTotalNum(subNum.intValue());
                 settingsDetail.setCourseType(CourseScheduleType.valueOf(courseType));
-                settingsDetail.setCourseTotalMinuties(Integer.parseInt(jsonObject.get(courseType).toString()) * subNum.intValue());
-                settingsDetail.setCourseCurrentPrice(unitPrice.multiply(new BigDecimal(settingsDetail.getCourseTotalMinuties())));
-                settingsDetail.setCourseOriginalPrice(settingsDetail.getCourseCurrentPrice());
+                settingsDetail.setUnitPrice(unitPrice);
+//                settingsDetail.setCourseTotalMinuties(Integer.parseInt(jsonObject.get(courseType).toString()) * subNum.intValue());
+//                settingsDetail.setCourseCurrentPrice(unitPrice.multiply(new BigDecimal(settingsDetail.getCourseTotalMinuties())));
+//                settingsDetail.setCourseOriginalPrice(settingsDetail.getCourseCurrentPrice());
                 courseMap.put(courseType,settingsDetail);
             }
             resultMap.put(classGroupId,courseMap);
         }
-        return resultMap;
+        result.put("defaultPaymentCalender",resultMap);
+        result.put("groupTypeSet",groupType);
+        return result;
     }
 
     @Override
@@ -3708,8 +3718,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         List<Long> studentPaymentIds = courseScheduleStudentPaymentDao.queryStudentNotStartByClassIdsAndStudentIds(classGroupIds,studentIds);
 
         musicGroupStudentClassAdjust.setStudentPaymentIds(JSON.toJSONString(studentPaymentIds));
+        //保存老师选择的课程时长
+        musicGroupStudentClassAdjust.setDefaultCourseTypeMinute(JSON.toJSONString(mergeClassSplitClassAffirmDto.getClassCourseMinuteMap()));
         //计算新增班级的可排课时长，总课次*默认时长  (用学员剩余的课程时长加上购买的时长，可能导致同一班级学员时长不一致)
-        musicGroupStudentClassAdjust.setClassCourseMinute(JSON.toJSONString(findClassCourseMinuteMap(classGroupIds)));
+        musicGroupStudentClassAdjust.setClassCourseMinute(JSON.toJSONString(findClassCourseMinuteMap(classGroupIds,mergeClassSplitClassAffirmDto.getClassCourseMinuteMap())));
         musicGroupStudentClassAdjustDao.insert(musicGroupStudentClassAdjust);
         //如果需要审核，校验参数配置
         checkMergeClassSplitClassAffirmParam(mergeClassSplitClassAffirmDto);
@@ -3812,17 +3824,17 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     }
 
     @Override
-    public Map<String,Long> findClassCourseMinuteMap(List<Integer> classGroupIds){
+    public Map<String,Long> findClassCourseMinuteMap(List<Integer> classGroupIds,Map<String,Long> classCourseMinuteMap){
         Map<String,Long> resultMap = new HashMap<>();
         //获取默认的排课时长
-        String courseDefaultMinutes = sysConfigDao.findConfigValue("music_course_default_minutes");
-        JSONObject jsonObject = JSON.parseObject(courseDefaultMinutes);
+//        String courseDefaultMinutes = sysConfigDao.findConfigValue("music_course_default_minutes");
+//        JSONObject jsonObject = JSON.parseObject(courseDefaultMinutes);
         //获取所选班级最大剩余课时
         Map<String,Long> map = MapUtil.convertIntegerMap(courseScheduleDao.findClassMaxCourseNumMap(classGroupIds));
-        Set<String> courseTypes = map.keySet();
+        Set<String> courseTypes = classCourseMinuteMap.keySet();
         for (String courseType : courseTypes) {
-            //剩余时长*默认排课时长
-            resultMap.put(courseType,Integer.parseInt(jsonObject.get(courseType).toString()) * map.get(courseType));
+//            剩余时长*默认排课时长
+            resultMap.put(courseType,classCourseMinuteMap.get(courseType) * map.get(courseType));
         }
         return resultMap;
     }

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

@@ -324,11 +324,13 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 		List<CourseScheduleStudentPayment> courseScheduleStudentPayments = new ArrayList<>();
 
 		//获取默认的排课时长
-		String courseDefaultMinutes = sysConfigDao.findConfigValue("music_course_default_minutes");
-		JSONObject jsonObject = JSON.parseObject(courseDefaultMinutes);
+//		classAdjust.getDefaultCourseTypeMinute();
+//		String courseDefaultMinutes = sysConfigDao.findConfigValue("music_course_default_minutes");
+		JSONObject jsonObject = JSON.parseObject(classAdjust.getDefaultCourseTypeMinute());
 
 		for (Integer studentId : studentIds) {
 			List<MusicGroupPaymentStudentCourseDetail> musicGroupPaymentStudentCourseDetails = null;
+			BigDecimal typeCourseTotalOriginalPrice = new BigDecimal("0"), typeCourseTotalCurrentPrice = new BigDecimal("0");
 			for (int i = 0; i < courseSchedules.size(); i++) {
 				CourseSchedule courseSchedule = courseSchedules.get(i);
 				//优先处理之前的剩余课程
@@ -366,14 +368,17 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 				MusicGroupPaymentCalenderCourseSettings courseSetting = musicGroupPaymentCalenderCourseSettings.get(0);
 				//课程每分钟原价
 				BigDecimal unitMinuteOriginalPrice = courseSetting.getCourseOriginalPrice().divide(new BigDecimal(courseSetting.getCourseTotalMinuties()), CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_DOWN);
+
 				//课程每分钟现价
 				BigDecimal unitMinuteCurrentPrice = courseSetting.getCourseCurrentPrice().divide(new BigDecimal(courseSetting.getCourseTotalMinuties()), CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_DOWN);
 
 				//默认课程时长
 				int courseDuration = Integer.parseInt(jsonObject.get(courseSchedule.getType().getCode()).toString());
 				BigDecimal courseOriginalPrice = unitMinuteOriginalPrice.multiply(new BigDecimal(courseDuration)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_DOWN);
+				typeCourseTotalOriginalPrice = typeCourseTotalOriginalPrice.add(courseOriginalPrice);
 				//课程现价
 				BigDecimal courseCurrentPrice = unitMinuteCurrentPrice.multiply(new BigDecimal(courseDuration)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_DOWN);
+				typeCourseTotalCurrentPrice = typeCourseTotalCurrentPrice.add(courseCurrentPrice);
 				CourseScheduleStudentPayment cssp = new CourseScheduleStudentPayment();
 				cssp.setGroupType(courseSchedule.getGroupType());
 				cssp.setMusicGroupId(courseSchedule.getMusicGroupId());
@@ -381,9 +386,14 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 				cssp.setClassGroupId(courseSchedule.getClassGroupId());
 				cssp.setBatchNo(batchNo);
 				cssp.setUserId(studentId);
-				cssp.setOriginalPrice(courseOriginalPrice);
-				cssp.setExpectPrice(courseCurrentPrice);
 				cssp.setActualPrice(BigDecimal.ZERO);
+				if(courseSchedules.size() - 1 == i){
+					cssp.setOriginalPrice(courseOriginalPrice.add(courseSetting.getCourseOriginalPrice().subtract(typeCourseTotalOriginalPrice)));
+					cssp.setExpectPrice(courseCurrentPrice.add(courseSetting.getCourseCurrentPrice().subtract(typeCourseTotalCurrentPrice)));
+				}else {
+					cssp.setOriginalPrice(courseOriginalPrice);
+					cssp.setExpectPrice(courseCurrentPrice);
+				}
 				courseScheduleStudentPayments.add(cssp);
 				//获取课程类型默认排课时长
 				int typeCourseDuration = Integer.parseInt(jsonObject.get(courseSchedule.getType().getCode()).toString());

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

@@ -21,6 +21,7 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import com.ym.mec.biz.dal.entity.*;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,22 +61,10 @@ import com.ym.mec.biz.dal.dto.MusicGroupPaymentCalenderAuditDto;
 import com.ym.mec.biz.dal.dto.MusicGroupPaymentCalenderDto;
 import com.ym.mec.biz.dal.dto.MusicGroupPaymentCalenderDto.MusicGroupPaymentDateRange;
 import com.ym.mec.biz.dal.entity.CourseSchedule.CourseScheduleType;
-import com.ym.mec.biz.dal.entity.MusicGroup;
-import com.ym.mec.biz.dal.entity.MusicGroupBuildLog;
-import com.ym.mec.biz.dal.entity.MusicGroupOrganizationCourseSettings;
-import com.ym.mec.biz.dal.entity.MusicGroupOrganizationCourseSettingsDetail;
-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.PaymentCalenderStatusEnum;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentType;
-import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderCourseSettings;
-import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail;
-import com.ym.mec.biz.dal.entity.MusicGroupPaymentStudentCourseDetail;
-import com.ym.mec.biz.dal.entity.MusicGroupStudentClassAdjust;
-import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus;
-import com.ym.mec.biz.dal.entity.Organization;
-import com.ym.mec.biz.dal.entity.OrganizationCourseUnitPriceSettings;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
 import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
@@ -921,17 +910,6 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			return;
 		}
 		List<ClassGroup4MixDto> classGroup4MixDtos = JSON.parseArray(musicGroupStudentClassAdjust.getNewClassGroupJson(), ClassGroup4MixDto.class);
-		//开始排课
-		ClassGroup4MixDto classGroup4MixDto = classGroup4MixDtos.get(0);
-		classGroup4MixDto.setMusicGroupStudentClassAdjustId(musicGroupStudentClassAdjust.getId());
-		classGroup4MixDto.setClassCourseMinute(musicGroupStudentClassAdjust.getClassCourseMinute());
-		List<CourseTimeDto> courseTimeDtoList = classGroup4MixDto.getCourseTimeDtoList();
-		List<CourseTimeDto> courseTimeDtoListBackup = Arrays.asList(new CourseTimeDto[courseTimeDtoList.size()]);
-		try {
-			Collections.copy(courseTimeDtoListBackup,courseTimeDtoList);
-		} catch (Exception e) {
-			throw new BizException("拷贝课程信息异常");
-		}
 
 		List<MusicGroupPaymentCalender> musicGroupPaymentCalenders = musicGroupPaymentCalenderDao.findByBatchNo(batchNo);
 		for (MusicGroupPaymentCalender calender : musicGroupPaymentCalenders) {
@@ -941,11 +919,12 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			musicGroupPaymentCalenderDetailService.batchAdd(calender.getId(),list2);
 		}
 		//每种课程类型单独排课
-		for (CourseTimeDto courseTimeDto : courseTimeDtoListBackup) {
-			List<CourseTimeDto> courseTimeDtos = new ArrayList<>();
-			courseTimeDtos.add(courseTimeDto);
-			classGroup4MixDto.setCourseTimeDtoList(courseTimeDtos);
-			classGroupService.classGroupAdjust2(classGroup4MixDto);
+		ClassGroup classGroup = null;
+		for (ClassGroup4MixDto classGroup4MixDto : classGroup4MixDtos) {
+			classGroup4MixDto.setClassGroup(classGroup);
+			classGroup4MixDto.setMusicGroupStudentClassAdjustId(musicGroupStudentClassAdjust.getId());
+			classGroup4MixDto.setClassCourseMinute(musicGroupStudentClassAdjust.getClassCourseMinute());
+			classGroup = classGroupService.classGroupAdjust2(classGroup4MixDto);
 		}
 		//排课完成后删除所选课程
 		List<Long> courseIds = JSON.parseArray(musicGroupStudentClassAdjust.getSubLockCourseIds(), Long.class);

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

@@ -14,6 +14,7 @@
 		<result column="class_group_ids_" property="classGroupIds" />
 		<result column="student_ids_" property="studentIds" />
 		<result column="class_course_minute_" property="classCourseMinute" />
+		<result column="default_course_type_minute_" property="defaultCourseTypeMinute" />
 		<result column="all_lock_course_ids_" property="allLockCourseIds" />
 		<result column="sub_lock_course_ids_" property="subLockCourseIds" />
 		<result column="student_payment_ids_" property="studentPaymentIds" />
@@ -37,14 +38,17 @@
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupStudentClassAdjust" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO music_group_student_class_adjust (music_group_id_,batch_no_,new_class_group_json_,
 		class_group_ids_,student_ids_,class_course_minute_,all_lock_course_ids_,sub_lock_course_ids_,
-		operator_id_,student_payment_ids_,class_group_students_,create_time_,update_time_)
+		operator_id_,student_payment_ids_,class_group_students_,default_course_type_minute_,create_time_,update_time_)
 		VALUES(#{musicGroupId},#{batchNo},#{newClassGroupJson},#{classGroupIds},#{studentIds},
-		#{classCourseMinute},#{allLockCourseIds},#{subLockCourseIds},#{operatorId},#{studentPaymentIds},#{classGroupStudents},NOW(),NOW())
+		#{classCourseMinute},#{allLockCourseIds},#{subLockCourseIds},#{operatorId},#{studentPaymentIds},#{classGroupStudents},#{defaultCourseTypeMinute},NOW(),NOW())
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.MusicGroupStudentClassAdjust">
 		UPDATE music_group_student_class_adjust <set>
+		<if test="defaultCourseTypeMinute != null">
+			default_course_type_minute_ = #{defaultCourseTypeMinute},
+		</if>
 		<if test="classGroupStudents != null">
 			class_group_students_ = #{classGroupStudents},
 		</if>

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

@@ -521,7 +521,7 @@
         LEFT JOIN sys_user suo ON suo.id_ = ta.operator_
         LEFT JOIN course_schedule cs ON cs.id_ = ta.course_schedule_id_
         <include refid="queryTeacherAttendanceComplaintsSql"/>
-        ORDER BY cs.class_date_ ASC,cs.start_class_time_ ASC
+        ORDER BY cs.class_date_ DESC,cs.start_class_time_ DESC
         <include refid="global.limit"/>
     </select>
     <sql id="queryTeacherAttendanceComplaintsSql">

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

@@ -357,10 +357,10 @@ public class ClassGroupController extends BaseController {
         return succeed(classGroupService.mergeClassSplitClassAffirm(mergeClassSplitClassAffirmDto));
     }
 
-    @ApiOperation(value = "进行中乐团-修改-班级详情-学员班级调整-合并结果确认-获取新班级可排课时长")
-    @PostMapping("/findClassCourseMinute")
-    @PreAuthorize("@pcs.hasPermissions('classGroup/findClassCourseMinute')")
-    public HttpResponseResult findClassCourseMinuteMap(@RequestBody List<Integer> classGroupIds){
-        return succeed(classGroupService.findClassCourseMinuteMap(classGroupIds));
-    }
+//    @ApiOperation(value = "进行中乐团-修改-班级详情-学员班级调整-合并结果确认-获取新班级可排课时长")
+//    @PostMapping("/findClassCourseMinute")
+//    @PreAuthorize("@pcs.hasPermissions('classGroup/findClassCourseMinute')")
+//    public HttpResponseResult findClassCourseMinuteMap(@RequestBody List<Integer> classGroupIds){
+//        return succeed(classGroupService.findClassCourseMinuteMap(classGroupIds));
+//    }
 }