Browse Source

1、课酬确认相关
2、VIP课导出添加学生姓名和编号

Joburgess 5 years ago
parent
commit
32231447d8

+ 10 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherCourseSalaryDetail4WebDto.java

@@ -24,6 +24,8 @@ public class TeacherCourseSalaryDetail4WebDto {
 
     private Date startClassTime;
 
+    private Date endClassTime;
+
     private String courseName;
 
     private Integer teacherId;
@@ -48,6 +50,14 @@ public class TeacherCourseSalaryDetail4WebDto {
 
     private String memo;
 
+    public Date getEndClassTime() {
+        return endClassTime;
+    }
+
+    public void setEndClassTime(Date endClassTime) {
+        this.endClassTime = endClassTime;
+    }
+
     public Long getId() {
         return id;
     }

+ 2 - 0
mec-biz/src/main/resources/config/mybatis/CourseScheduleTeacherSalaryMapper.xml

@@ -728,6 +728,7 @@
 		<result property="groupType" column="group_type_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result property="courseScheduleId" column="course_schedule_id_" />
 		<result property="startClassTime" column="classes_start_time_" />
+		<result property="endClassTime" column="classes_end_time_" />
 		<result property="courseName" column="course_name_" />
 		<result property="teacherId" column="teacher_id_" />
 		<result property="teacherName" column="teacher_name_" />
@@ -785,6 +786,7 @@
 			cs.id_ course_schedule_id_,
 			cs.group_type_,
 			CONCAT(cs.class_date_, ' ', cs.start_class_time_) classes_start_time_,
+			CONCAT(cs.class_date_, ' ', cs.end_class_time_) classes_end_time_,
 			cs.name_ course_name_,
 			csts.user_id_ teacher_id_,
 			su.real_name_ teacher_name_,