update

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

@@ -14,6 +14,9 @@ public class StudentBuyPracticeDto {
     //老师名
     private String teacherName;
 
+    //老师名
+    private String courseGroupTeacherName;
+
     //分部
     private String organName;
 
@@ -32,6 +35,14 @@ public class StudentBuyPracticeDto {
     //时间差
     private int intervalDay;
 
+    public String getCourseGroupTeacherName() {
+        return courseGroupTeacherName;
+    }
+
+    public void setCourseGroupTeacherName(String courseGroupTeacherName) {
+        this.courseGroupTeacherName = courseGroupTeacherName;
+    }
+
     public String getTeacherName() {
         return teacherName;
     }

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

@@ -412,6 +412,7 @@
         <result property="studentId" column="student_id_"/>
         <result property="studentName" column="student_name_"/>
         <result property="teacherName" column="teacher_name_"/>
+        <result property="courseGroupTeacherName" column="course_group_teacher_"/>
         <result property="firstBuyTime" column="first_buy_time_"/>
         <result property="intervalDay" column="interval_day_"/>
         <result property="lastClassDate" column="last_class_date_"/>
@@ -423,7 +424,7 @@
         b.lastClassDate last_class_date_,c.firstBuyTime first_buy_time_,
         CASE WHEN DATEDIFF(c.firstBuyTime,b.lastClassDate) &lt; 0 THEN 0 ELSE DATEDIFF(c.firstBuyTime,b.lastClassDate)
         END interval_day_,
-        CASE WHEN c.firstBuyTime IS NULL THEN 0 ELSE 1 END buy_practice_,d.teacher_name_
+        CASE WHEN c.firstBuyTime IS NULL THEN 0 ELSE 1 END buy_practice_,d.teacher_name_,d.course_group_teacher_
         FROM
         (SELECT DISTINCT(pg.`student_id_`),pg.`organ_id_` FROM `practice_group` pg WHERE pg.`group_status_` in
         ('NORMAL','FINISH')) a
@@ -436,13 +437,14 @@
         FROM `practice_group` pg
         WHERE pg.`buy_months_` IS NOT NULL AND pg.`group_status_` IN ('NORMAL','FINISH') GROUP
         BY pg.`student_id_` ) c ON a.student_id_ = c.student_id_
-        LEFT JOIN (SELECT GROUP_CONCAT(DISTINCT su.real_name_) teacher_name_,pg.student_id_
+        LEFT JOIN (SELECT GROUP_CONCAT(DISTINCT su.real_name_) teacher_name_,pg.student_id_,GROUP_CONCAT(DISTINCT suc.real_name_) course_group_teacher_
         FROM `practice_group` pg
         LEFT JOIN `course_schedule` cs ON cs.`music_group_id_` = pg.`id_`
         LEFT JOIN sys_user su ON su.id_ = cs.actual_teacher_id_
+        LEFT JOIN sys_user suc ON suc.id_ = pg.user_id_
         WHERE cs.`group_type_` = 'PRACTICE' AND pg.`group_status_` IN ('NORMAL','FINISH') GROUP BY pg.`student_id_` ) d ON a.student_id_ = d.student_id_
         LEFT JOIN `sys_user` u ON u.`id_` = a.student_id_
-        LEFT JOIN `organization` o ON o.`id_` = a.organ_id_
+        LEFT JOIN `organization` o ON o.`id_` = a.organ_id_;
         <include refid="queryStudentBuysSql"/>
         <include refid="global.limit"/>
     </select>

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

@@ -107,9 +107,9 @@ public class ExportController extends BaseController {
         List<StudentBuyPracticeDto> rows = practiceGroupService.studentBuys(queryInfo).getRows();
         OutputStream outputStream = response.getOutputStream();
         try {
-            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"学员编号", "学员名称", "所属分部","老师名称", "购买网管课",
+            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"学员编号", "学员名称", "所属分部","课程老师","课程组老师", "购买网管课",
                     "免费课结束日期", "首次购买日期", "时间差"}, new String[]{
-                    "studentId", "studentName", "organName","teacherName" ,"buyPractice.msg",
+                    "studentId", "studentName", "organName","teacherName","courseGroupTeacherName" ,"buyPractice.msg",
                     "lastClassDate", "firstBuyTime", "intervalDay"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");