Browse Source

Merge branch 'children_day_course'

Joburgess 4 years ago
parent
commit
49634d8a5c

+ 5 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -693,6 +693,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		//创建班级信息
 		ClassGroup classGroup=new ClassGroup();
 		classGroup.setSubjectIdList(vipGroupApplyBaseInfoDto.getSubjectIdList());
+		if(StringUtils.isBlank(classGroup.getSubjectIdList())){
+			classGroup.setSubjectIdList(studentDetail.get(0).getSubjectIdList());
+		}
 		classGroup.setExpectStudentNum(vipGroupCategory.getStudentNum());
 		classGroup.setStudentNum(studentIdList.size());
 		classGroup.setName(vipGroupApplyBaseInfoDto.getName());
@@ -905,6 +908,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			String offlineCourseStartTime = courseData.getString("offline_course_start_time");
 			int totalCourseNum = onlineCourseNum + offlineCourseNum;
 			Integer teacherId = courseData.getInteger("teacher_id");
+			Integer eduTeacherId = StringUtils.isBlank(courseData.getString("edu_teacher_id"))?null:courseData.getInteger("edu_teacher_id");
 			String studentIdsStr= courseData.getString("student_ids");
 			if(StringUtils.isBlank(studentIdsStr)){
 				throw new BizException("请选择学员");
@@ -1027,6 +1031,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			
 			vipGroupApplyBaseInfoDto.setAllCourseNum(totalCourseNum);
 			vipGroupApplyBaseInfoDto.setTeacherId(teacherId.longValue());
+			vipGroupApplyBaseInfoDto.setEducationalTeacherId(eduTeacherId);
 			vipGroupApplyBaseInfoDto.setSubjectIdList(stu.getSubjectIdList());
 			vipGroupApplyBaseInfoDto.setFirstStudentId(studentIds.get(0));
 			vipGroupApplyBaseInfoDto.setUserId(teacherId);