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

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

@@ -1,9 +1,14 @@
 package com.ym.mec.biz.dal.dto;
 
+import com.ym.mec.biz.dal.entity.CourseSchedule;
 import io.swagger.annotations.ApiModelProperty;
 
 public class CourseTimeDto {
 
+
+    @ApiModelProperty(value = "课程类型", required = true)
+    private CourseSchedule.CourseScheduleType courseType;
+
     @ApiModelProperty(value = "排课星期几")
     private Integer dayOfWeek;
 
@@ -13,6 +18,14 @@ public class CourseTimeDto {
     @ApiModelProperty(value = "上课结束时间")
     private String endClassTime;
 
+    public CourseSchedule.CourseScheduleType getCourseType() {
+        return courseType;
+    }
+
+    public void setCourseType(CourseSchedule.CourseScheduleType courseType) {
+        this.courseType = courseType;
+    }
+
     public Integer getDayOfWeek() {
         return dayOfWeek;
     }

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

@@ -265,21 +265,21 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @param classGroup4MixDto
      * @return
      */
-    ClassGroup classGroupAdjust(ClassGroup4MixDto classGroup4MixDto) throws Exception;
+    ClassGroup classGroupAdjust(List<ClassGroup4MixDto> classGroup4MixDto);
 
     /**
      * 班级调整(修改班级)
-     * @param classGroup4MixDto
+     * @param classGroup4MixDtos
      * @return
      */
-    ClassGroup classGroupUpdate(ClassGroup4MixDto classGroup4MixDto) throws Exception;
+    ClassGroup classGroupUpdate(List<ClassGroup4MixDto> classGroup4MixDtos) throws Exception;
 
     /**
      * 班级调整(增加临时班级)
-     * @param classGroup4MixDto
+     * @param classGroup4MixDtos
      * @return
      */
-    ClassGroup classGroupSnap(ClassGroup4MixDto classGroup4MixDto) throws Exception;
+    ClassGroup classGroupSnap(List<ClassGroup4MixDto> classGroup4MixDtos) throws Exception;
 
 
     /**

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

@@ -282,7 +282,7 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 	public void createForMusicGroup(String musicGroupId, List<CourseSchedule> courseSchedules, List<Integer> studentIds) {
 		MusicGroupPaymentCalender musicGroupUnusedFirstPaymentCalender = musicGroupPaymentCalenderDao.getMusicGroupUnusedFirstPaymentCalender(musicGroupId, studentIds);
 		if(Objects.isNull(musicGroupUnusedFirstPaymentCalender)){
-			throw new BizException("当前乐团无未使用缴费记录");
+			throw new BizException("当前乐团暂无新缴费设置");
 		}
 
 		List<MusicGroupPaymentCalenderDetail> unusedPaymentCalenderDetail = musicGroupPaymentCalenderDetailDao.getCalenderDetailWithCalender(musicGroupUnusedFirstPaymentCalender.getId());

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

@@ -321,7 +321,7 @@
             AND mgpc.music_group_id_ = #{musicGroupId}
             AND mgpcd.use_in_course_ = 1
             AND mgpcd.user_id_ IN
-            <foreach collection="studentIds" item="studentIds" open="(" close=")" separator=",">
+            <foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">
                 #{studentId}
             </foreach>
         ORDER BY

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

@@ -238,24 +238,24 @@ public class ClassGroupController extends BaseController {
     @PostMapping("/revisionAddClassGroup")
     @PreAuthorize("@pcs.hasPermissions('classGroup/revisionAddClassGroup')")
     @ApiImplicitParams({@ApiImplicitParam(name = "ClassGroup4MixDto", value = "添加班级结构", required = true, dataType = "String")})
-    public HttpResponseResult revisionAddClassGroup(@RequestBody ClassGroup4MixDto classGroup4MixDto) throws Exception {
-        return succeed(classGroupService.classGroupAdjust(classGroup4MixDto));
+    public HttpResponseResult revisionAddClassGroup(@RequestBody List<ClassGroup4MixDto> classGroup4MixDtos) throws Exception {
+        return succeed(classGroupService.classGroupAdjust(classGroup4MixDtos));
     }
 
     @ApiOperation(value = "调整班级(临时调整)")
     @PostMapping("/revisionClassGroup")
     @PreAuthorize("@pcs.hasPermissions('classGroup/revisionClassGroup')")
     @ApiImplicitParams({@ApiImplicitParam(name = "ClassGroup4MixDto", value = "添加班级结构", required = true, dataType = "String")})
-    public HttpResponseResult revisionClassGroup(@RequestBody ClassGroup4MixDto classGroup4MixDto) throws Exception {
-        return succeed(classGroupService.classGroupSnap(classGroup4MixDto));
+    public HttpResponseResult revisionClassGroup(@RequestBody List<ClassGroup4MixDto> classGroup4MixDtos) throws Exception {
+        return succeed(classGroupService.classGroupSnap(classGroup4MixDtos));
     }
 
     @ApiOperation(value = "调整班级(调整老师，重排课)")
     @PostMapping("/classGroupUpdate")
     @PreAuthorize("@pcs.hasPermissions('classGroup/classGroupUpdate')")
     @ApiImplicitParams({@ApiImplicitParam(name = "ClassGroup4MixDto", value = "添加班级结构", required = true, dataType = "String")})
-    public HttpResponseResult classGroupUpdate(@RequestBody ClassGroup4MixDto classGroup4MixDto) throws Exception {
-        return succeed(classGroupService.classGroupUpdate(classGroup4MixDto));
+    public HttpResponseResult classGroupUpdate(@RequestBody List<ClassGroup4MixDto> classGroup4MixDtos) throws Exception {
+        return succeed(classGroupService.classGroupUpdate(classGroup4MixDtos));
     }
 
     @ApiOperation(value = "小班报名详情")