update

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

@@ -26,9 +26,12 @@ public class ExportTeacherSalaryDto{
     //乐团模式
     private String changeType;
 
-    //活动名称
+    //阶梯活动名称
     private String activeName;
 
+    //vip活动名称
+    private String vipActiveName;
+
     //线上课/线下课
     private String teachMode;
 
@@ -83,6 +86,14 @@ public class ExportTeacherSalaryDto{
     //应到学员
     private int studentNum;
 
+    public String getVipActiveName() {
+        return vipActiveName;
+    }
+
+    public void setVipActiveName(String vipActiveName) {
+        this.vipActiveName = vipActiveName;
+    }
+
     public double getOfflineClassesUnitPrice() {
         return offlineClassesUnitPrice;
     }

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

@@ -490,6 +490,7 @@
 		<result property="studentNum" column="studentNum"/>
 		<result property="teacherId" column="teacherId"/>
 		<result property="activeName" column="activeName"/>
+		<result property="vipActiveName" column="vip_active_name_"/>
 		<result property="courseScheduleType" column="courseScheduleType"/>
 		<result property="signOutStatus" column="signOutStatus"/>
 		<result property="signInStatus" column="signInStatus"/>
@@ -542,14 +543,14 @@
 		GROUP BY ts.id_,ta.id_
 	</select>
 	<select id="exportVipTeacherSalary" resultMap="ExportTeacherSalaryDtoMap">
-		SELECT cs.`id_` courseScheduleId,u.id_ teacherId,vgo.name_ courseOrganName,vg.name_ groupName,
+		SELECT cs.`id_` courseScheduleId,u.id_ teacherId,vgo.name_ courseScheduleOrganName,vg.name_ groupName,
 		u.real_name_ teacherName,o.name_ teacherOrganName,
 		CASE WHEN cs.teach_mode_ = 'OFFLINE' THEN '线下' WHEN cs.teach_mode_ = 'ONLINE' THEN '线上' END teach_mode_,
 		CASE WHEN t.job_nature_ = 'PART_TIME' THEN '兼职' WHEN t.job_nature_ = 'FULL_TIME' THEN '全职' ELSE '零时工' END jobType,
 		'vip课' courseScheduleType,
 		cs.class_date_ classDate,cs.start_class_time_ courseScheduleStartTime,cs.end_class_time_ courseScheduleEndTime,
 		ROUND((UNIX_TIMESTAMP(cs.end_class_time_)-UNIX_TIMESTAMP(cs.start_class_time_))/60) signCourseScheduleTime,
-		ts.actual_salary_ price,s.name_ address,
+		ts.actual_salary_ price,s.name_ address,vga.name_ vip_active_name_,
 		CASE WHEN ts.teacher_role_ = 'TEACHING' THEN '助教' ELSE '主教' END teacherRole,
 		CASE WHEN ta.sign_in_status_ = 0 THEN '异常' WHEN ta.sign_in_status_ = 1 THEN '正常' END signInStatus,
 		CASE WHEN ta.sign_out_status_=0 THEN '异常' WHEN ta.sign_out_status_ = 1 THEN '正常' END signOutStatus,
@@ -566,6 +567,7 @@
 		LEFT JOIN school s ON s.id_ = cs.schoole_id_
 		LEFT JOIN course_schedule_student_payment sp ON sp.course_schedule_id_ = ts.course_schedule_id_
 		LEFT JOIN vip_group vg ON (vg.id_ = ts.music_group_id_ AND ts.group_type_ = 'VIP')
+		LEFT JOIN vip_group_activity vga ON vg.vip_group_activity_id_ = vga.id_
 		LEFT JOIN organization vgo ON vgo.id_ = vg.organ_id_
 		WHERE cs.class_date_ BETWEEN #{firstDayOfMonth} AND #{lastDayOfMonth} AND cs.`del_flag_` != 1 AND cs.group_type_ = 'VIP' AND ts.settlement_time_ IS NOT NULL
 		GROUP BY ts.id_,ta.id_
@@ -575,7 +577,7 @@
 		WHERE csts.settlement_time_ IS NULL AND FIND_IN_SET(csts.course_schedule_id_,#{courseScheduleIds})
 	</select>
 	<select id="exportPracticeTeacherSalary" resultMap="ExportTeacherSalaryDtoMap">
-		SELECT cs.`id_` courseScheduleId,u.id_ teacherId,pgo.name_ courseOrganName,pg.name_ groupName,
+		SELECT cs.`id_` courseScheduleId,u.id_ teacherId,pgo.name_ courseScheduleOrganName,pg.name_ groupName,
 		u.real_name_ teacherName,o.name_ teacherOrganName,
 		CASE WHEN cs.teach_mode_ = 'OFFLINE' THEN '线下' WHEN cs.teach_mode_ = 'ONLINE' THEN '线上' END teach_mode_,
 		CASE WHEN t.job_nature_ = 'PART_TIME' THEN '兼职' WHEN t.job_nature_ = 'FULL_TIME' THEN '全职' ELSE '零时工' END jobType,