update

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
 import java.util.Date;
+import java.util.List;
 
 import com.ym.mec.biz.dal.entity.CourseSchedule.CourseScheduleType;
 import com.ym.mec.biz.dal.enums.TeachModeEnum;
@@ -13,7 +14,7 @@ public class BatchInsertCoursesDto {
 
 	private Date startDate;
 
-	private String teachingArrangement;
+	private List<CourseTimeDto> teachingArrangementList;
 
 	private TeachModeEnum teachMode;
 
@@ -47,12 +48,12 @@ public class BatchInsertCoursesDto {
 		this.startDate = startDate;
 	}
 
-	public String getTeachingArrangement() {
-		return teachingArrangement;
+	public List<CourseTimeDto> getTeachingArrangementList() {
+		return teachingArrangementList;
 	}
 
-	public void setTeachingArrangement(String teachingArrangement) {
-		this.teachingArrangement = teachingArrangement;
+	public void setTeachingArrangementList(List<CourseTimeDto> teachingArrangementList) {
+		this.teachingArrangementList = teachingArrangementList;
 	}
 
 	public TeachModeEnum getTeachMode() {

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

@@ -8,6 +8,7 @@ import com.ym.mec.biz.dal.dto.CourseAttendanceDetailHeadInfoDto;
 import com.ym.mec.biz.dal.dto.CoursePostponeDto;
 import com.ym.mec.biz.dal.dto.CourseScheduleDto;
 import com.ym.mec.biz.dal.dto.CourseScheduleEndDto;
+import com.ym.mec.biz.dal.dto.CourseTimeDto;
 import com.ym.mec.biz.dal.dto.CreateCourseScheduleDto;
 import com.ym.mec.biz.dal.dto.TeacherAttendanceDto;
 import com.ym.mec.biz.dal.dto.VipGroupCourseAdjustInfoDto;
@@ -82,15 +83,15 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
 	 * @param classGroupId 班级编号
 	 * @param coursesTimes 增加的课次
 	 * @param startDate 排课开始时间
-	 * @param teachingArrangement 教学安排（周几，几点-几点）
+	 * @param teachingArrangementList 教学安排（周几，几点-几点）
 	 * @param teachMode 教学模式
 	 * @param type 课程类型
 	 * @param schoolId 教学点
 	 * @param isJumpHoliday 是否跳过节假日
 	 * @return
 	 */
-	boolean batchAddCourseSchedule(Integer classGroupId, int coursesTimes, Date startDate, String teachingArrangement, TeachModeEnum teachMode,
-			CourseScheduleType type, Integer schoolId, boolean isJumpHoliday);
+	boolean batchAddCourseSchedule(Integer classGroupId, int coursesTimes, Date startDate, List<CourseTimeDto> teachingArrangementList,
+			TeachModeEnum teachMode, CourseScheduleType type, Integer schoolId, boolean isJumpHoliday);
 
 	/**
 	 * @Author: Joburgess

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

@@ -247,9 +247,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
-	public boolean batchAddCourseSchedule(Integer classGroupId, int coursesTimes, Date startDate, String teachingArrangement, TeachModeEnum teachMode,
-			CourseScheduleType type, Integer schoolId, boolean isJumpHoliday) {
+	@Transactional(rollbackFor = Exception.class)
+	public boolean batchAddCourseSchedule(Integer classGroupId, int coursesTimes, Date startDate, List<CourseTimeDto> teachingArrangementList,
+			TeachModeEnum teachMode, CourseScheduleType type, Integer schoolId, boolean isJumpHoliday) {
 		ClassGroup classGroup = classGroupService.get(classGroupId);
 		if (classGroup == null) {
 			throw new BizException("排课失败，班级信息不存在");
@@ -267,7 +267,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			throw new BizException("暂不支持vip课加课");
 		}
 
-		List<CourseTimeDto> teachingArrangementList = JsonUtil.parseArray(teachingArrangement, CourseTimeDto.class);
 		if (teachingArrangementList == null || teachingArrangementList.size() == 0) {
 			throw new BizException("请设置课时安排");
 		}

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

@@ -287,7 +287,7 @@ public class CourseScheduleController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/batchAddCourses')")
     public Object batchAddCourses(@RequestBody BatchInsertCoursesDto batchInsertCoursesDto){
 		scheduleService.batchAddCourseSchedule(batchInsertCoursesDto.getClassGroupId(), batchInsertCoursesDto.getCoursesTimes(),
-				batchInsertCoursesDto.getStartDate(), batchInsertCoursesDto.getTeachingArrangement(), batchInsertCoursesDto.getTeachMode(),
+				batchInsertCoursesDto.getStartDate(), batchInsertCoursesDto.getTeachingArrangementList(), batchInsertCoursesDto.getTeachMode(),
 				batchInsertCoursesDto.getType(), batchInsertCoursesDto.getSchoolId(), batchInsertCoursesDto.getIsJumpHoliday());
         return succeed();
     }