update

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

@@ -1,12 +1,8 @@
 package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.biz.dal.entity.CourseSchedule;
-import com.ym.mec.biz.dal.enums.StudentAttendanceStatusEnum;
-import com.ym.mec.biz.dal.enums.TeachTypeEnum;
-import io.swagger.annotations.ApiModelProperty;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 
 import java.util.Date;
-import java.util.List;
 
 
 public class CourseGroupExportDto {
@@ -21,6 +17,16 @@ public class CourseGroupExportDto {
     private Date classEndDate;
     private Integer totalClassTimes = 0;
     private Integer noStartClassTimes = 0;
+    //是否购买
+    private YesOrNoEnum buyPractice;
+
+    public YesOrNoEnum getBuyPractice() {
+        return buyPractice;
+    }
+
+    public void setBuyPractice(YesOrNoEnum buyPractice) {
+        this.buyPractice = buyPractice;
+    }
 
     public String getOrganName() {
         return organName;

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

@@ -475,12 +475,14 @@
         <result column="class_end_date_" property="classEndDate"/>
         <result column="total_class_times_" property="totalClassTimes"/>
         <result column="no_start_class_times_" property="noStartClassTimes"/>
+        <result column="buy_practice_" property="buyPractice" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
     <select id="getPracticeGroupExport" resultMap="courseGroupExport">
         SELECT pg.student_id_,
         su.username_ student_name_,
         o.name_ organ_name_,
-        MAX(pg.courses_expire_date_) expire_date_
+        MAX(pg.courses_expire_date_) expire_date_,
+        CASE WHEN pg.buy_months_ IS NULL THEN 0 ELSE 1 END buy_practice_
         FROM practice_group pg
         LEFT JOIN organization o on o.id_ = pg.organ_id_
         LEFT JOIN sys_user su ON su.id_ = pg.student_id_

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

@@ -947,8 +947,8 @@ public class ExportController extends BaseController {
         }
 
         try {
-            String[] header = {"分部", "学生编号", "学生姓名", "网管课老师id", "网管课老师", "有效期截止时间", "课程截止时间", "总课时", "剩余课时"};
-            String[] body = {"organName", "studentId", "studentName", "teacherIds", "teacherName", "expireDate", "classEndDate", "totalClassTimes", "noStartClassTimes"};
+            String[] header = {"分部", "学生编号", "学生姓名", "网管课老师id", "网管课老师", "有效期截止时间", "课程截止时间", "总课时", "剩余课时", "是否购买"};
+            String[] body = {"organName", "studentId", "studentName", "teacherIds", "teacherName", "expireDate", "classEndDate", "totalClassTimes", "noStartClassTimes","buyPractice.msg"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, practiceGroupExports);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");