update

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

@@ -23,6 +23,9 @@ public class ExportTeacherSalaryDto{
     //课程班名称（乐团名或者小课名）
     private String groupName;
 
+    //课程班编号
+    private String groupId;
+
     //乐团模式
     private String changeType;
 
@@ -92,6 +95,14 @@ public class ExportTeacherSalaryDto{
     //应到学员
     private int studentNum;
 
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+
     public String getStudentSignInTime() {
         return studentSignInTime;
     }

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

@@ -540,6 +540,7 @@
 		<result property="studentSignOutTime" column="studentSignOutTime"/>
 		<result property="teacherName" column="teacherName"/>
 		<result property="groupName" column="groupName"/>
+		<result property="groupId" column="group_id_"/>
 		<result property="studentNum" column="studentNum"/>
 		<result property="teacherId" column="teacherId"/>
 		<result property="activeName" column="activeName"/>
@@ -566,7 +567,7 @@
  	</resultMap>
     <select id="exportMusicTeacherSalary" resultMap="ExportTeacherSalaryDtoMap">
 		SELECT cs.`id_` courseScheduleId,u.id_ teacherId,mgo.name_ courseScheduleOrganName,mg.name_ groupName,
-		ct.name_ changeType,u.real_name_ teacherName,o.name_ teacherOrganName,
+		ct.name_ changeType,u.real_name_ teacherName,o.name_ teacherOrganName,cs.music_group_id_ group_id_,
 		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,
 		CASE WHEN cs.type_ = 'SINGLE' THEN '单技课' WHEN cs.type_ = 'MIX' THEN '合奏课' WHEN cs.type_ = 'HIGH' THEN '小班课'  WHEN cs.type_ = 'VIP' THEN 'vip课'
@@ -597,7 +598,7 @@
 	</select>
 	<select id="exportVipTeacherSalary" resultMap="ExportTeacherSalaryDtoMap">
 		SELECT cs.`id_` courseScheduleId,u.id_ teacherId,vgo.name_ courseScheduleOrganName,vg.name_ groupName,
-		u.real_name_ teacherName,o.name_ teacherOrganName,
+		u.real_name_ teacherName,o.name_ teacherOrganName,cs.music_group_id_ group_id_,
 		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,
@@ -634,7 +635,7 @@
 	</select>
 	<select id="exportPracticeTeacherSalary" resultMap="ExportTeacherSalaryDtoMap">
 		SELECT cs.`id_` courseScheduleId,u.id_ teacherId,pgo.name_ courseScheduleOrganName,pg.name_ groupName,
-		u.real_name_ teacherName,o.name_ teacherOrganName,
+		u.real_name_ teacherName,o.name_ teacherOrganName,cs.music_group_id_ group_id_,
 		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,
 		'网管课' courseScheduleType,

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

@@ -85,12 +85,12 @@ public class ExportController extends BaseController {
         List<ExportTeacherSalaryDto> rows = courseScheduleTeacherSalaryService.exportTeacherSalary(queryInfo);
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"课时编号", "老师编号", "老师姓名", "老师分部", "工作类别",
-                    "课程分部", "课程班名称", "乐团模式", "vip活动名称", "阶梯奖励名称","线上课/线下课", "线上课单价", "线下课单价",
+                    "课程分部","课程组编号", "课程班名称", "乐团模式", "vip活动名称", "阶梯奖励名称","线上课/线下课", "线上课单价", "线下课单价",
                     "课程类别", "课时时长", "实际上课时长", "上课日期",
                     "上课时间", "教师签到状态", "教师签退状态", "教师签到时间", "教师签退时间",
                     "主辅", "上课地点", "应到学员", "学员签到时间", "学员签退时间","课时课酬","阶梯奖励"}, new String[]{
                     "courseScheduleId", "teacherId", "teacherName", "teacherOrganName", "jobType",
-                    "courseScheduleOrganName", "groupName", "changeType", "vipActiveName","activeName", "teachMode", "onlineClassesUnitPrice", "offlineClassesUnitPrice",
+                    "courseScheduleOrganName", "groupId", "groupName", "changeType", "vipActiveName","activeName", "teachMode", "onlineClassesUnitPrice", "offlineClassesUnitPrice",
                     "courseScheduleType","signCourseScheduleTime","currentTime","classDate","courseScheduleStartTime","signInStatus",
                     "signOutStatus","signInTime","signOutTime","teacherRole","address","studentNum","studentSignInTime","studentSignOutTime","price","rewards"}, rows);
             response.setContentType("application/octet-stream");