课程转换

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

@@ -84,6 +84,10 @@ public class ClassGroupDto extends BaseEntity {
 	@ApiModelProperty(value = "学员课程关联", required = true)
 	List<CourseScheduleStudentPayment> courseScheduleStudentPayments = new ArrayList<>();
 
+	public ClassGroupTypeEnum getType() {
+		return type;
+	}
+
 	public CourseSchedule.CourseScheduleType getCourseScheduleType() {
 		return courseScheduleType;
 	}

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

@@ -208,12 +208,12 @@
     <insert id="batchAddCourseSchedules" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
         INSERT INTO course_schedule
-        (group_type_,music_group_id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,
+        (id_,group_type_,music_group_id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,
         teacher_id_,actual_teacher_id_,create_time_,update_time_,type_,name_,teach_mode_,student_num_,leave_student_num_,
         schoole_id_,is_lock_,note_,teaching_content_,organ_id_,member_flag_,pre_course_flag_,valid_end_time_,valid_start_time_,tenant_id_)
         VALUE
         <foreach collection="list" item="course" separator=",">
-            (#{course.groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.musicGroupId},
+            (#{course.id},#{course.groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.musicGroupId},
             #{course.classGroupId},#{course.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             #{course.subsidy},#{course.classDate},#{course.startClassTime},#{course.endClassTime},#{course.teacherId},
             #{course.teacherId},now(),now(),#{course.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},

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

@@ -73,12 +73,12 @@
     <insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.TeacherAttendance" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
         INSERT INTO teacher_attendance
-        (group_type_,teacher_id_,music_group_id_,class_group_id_,course_schedule_id_,sign_in_time_,sign_in_status_,
+        (id_,group_type_,teacher_id_,music_group_id_,class_group_id_,course_schedule_id_,sign_in_time_,sign_in_status_,
         remark_,create_time_,sign_out_time_,sign_out_status_,sign_in_longitude_latitude_,sign_out_longitude_latitude_,current_schedule_id_,sign_out_attachments_,
         sign_out_remark_,update_attendance_type_,url_,sign_in_device_no_,sign_out_device_no_,tenant_id_)
         VALUE
         <foreach collection="teacherAttendances" item="teacherAttendance" separator=",">
-            (#{teacherAttendance.groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            (#{teacherAttendance.id},#{teacherAttendance.groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             #{teacherAttendance.teacherId},#{teacherAttendance.musicGroupId},#{teacherAttendance.classGroupId},
             #{teacherAttendance.courseScheduleId},#{teacherAttendance.signInTime},
             #{teacherAttendance.signInStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},