浏览代码

课程查询加上预排课条件

zouxuan 4 年之前
父节点
当前提交
1d3117db29
共有 1 个文件被更改,包括 5 次插入3 次删除
  1. 5 3
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

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

@@ -2810,20 +2810,22 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     classGroup4MixDto.getCourseType() == TRAINING_SINGLE || classGroup4MixDto.getCourseType() == TRAINING_MIX){
                 //单技课和合奏课最大的排课时长不能超过44 * 45 分钟
                 if(totalCourseMinutes > 44 * 45){
-                    throw new BizException("操作失败:单技课和合奏课最大的排课时长不能超过{}分钟",44*45);
+                    throw new BizException("操作失败:单技课和合奏课课时长已超过最大限制(1980分钟)");
                 }
                 if(classGroup4MixDto.getCourseType() == SINGLE || classGroup4MixDto.getCourseType() == TRAINING_SINGLE){
                     singleCourseMinutes = totalCourseMinutes;
                     //获取所选学员最大的已消耗的单技课时长
                     int maxSingleCourseMinutes = musicGroupSchoolTermStudentCourseDetailDao.getMaxSingleCourseMinutes(musicGroupSchoolTermCourseDetailId,studentIds);
                     if(44 * 45 - maxSingleCourseMinutes < totalCourseMinutes){
-                        throw new BizException("操作失败:所选学员可排单技课时长已不足{}分钟",totalCourseMinutes);
+//                        throw new BizException("操作失败:所选学员可排单技课时长已不足{}分钟",totalCourseMinutes);
+                        throw new BizException("操作失败:所选学员可排单技课时长已不足");
                     }
                 } else {
                     totalMixCourseMinutes = totalCourseMinutes;
                     int maxMixCourseMinutes = musicGroupSchoolTermStudentCourseDetailDao.getMaxMixCourseMinutes(musicGroupSchoolTermCourseDetailId,studentIds);
                     if(44 * 45 - maxMixCourseMinutes < totalCourseMinutes){
-                        throw new BizException("操作失败:所选学员可排合奏课时长已不足{}分钟",totalCourseMinutes);
+//                        throw new BizException("操作失败:所选学员可排合奏课时长已不足{}分钟",totalCourseMinutes);
+                        throw new BizException("操作失败:所选学员可排合奏课时长已不足");
                     }
                 }
             }