Merge remote-tracking branch 'origin/master'

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

@@ -11,6 +11,9 @@ public class MusicGroupCourseScheduleDto {
 
     @ApiModelProperty(value = "课程编号")
     private Integer courseScheduleId;
+    
+    @ApiModelProperty(value = "课程名称")
+    private String courseScheduleName;
 
     @ApiModelProperty(value = "上课日期",required = false)
     private String classDate;
@@ -262,4 +265,12 @@ public class MusicGroupCourseScheduleDto {
         this.masterTeacherName = masterTeacherName;
     }
 
+	public String getCourseScheduleName() {
+		return courseScheduleName;
+	}
+
+	public void setCourseScheduleName(String courseScheduleName) {
+		this.courseScheduleName = courseScheduleName;
+	}
+
 }

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

@@ -1,6 +1,6 @@
 package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
+import com.ym.mec.biz.dal.enums.PaymentFlagEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
@@ -41,7 +41,7 @@ public class MusicGroupStudentsDto{
     @ApiModelProperty(value = "学员状态 NORMAL(NORMAL, 在读), LEAVE(LEAVE, 请假), QUIT(QUIT, 退班)",required = false)
     private String studentStatus;
 
-    private PaymentStatusEnum paymentStatus;
+    private PaymentFlagEnum paymentStatus;
 
     @ApiModelProperty(value = "是否新增学员（1是0否）",required = false)
     private Integer isNewStudent;
@@ -170,11 +170,11 @@ public class MusicGroupStudentsDto{
         this.studentStatus = studentStatus;
     }
 
-    public PaymentStatusEnum getPaymentStatus() {
+    public PaymentFlagEnum getPaymentStatus() {
         return paymentStatus;
     }
 
-    public void setPaymentStatus(PaymentStatusEnum paymentStatus) {
+    public void setPaymentStatus(PaymentFlagEnum paymentStatus) {
         this.paymentStatus = paymentStatus;
     }
 

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/PaymentFlagEnum.java

@@ -0,0 +1,27 @@
+package com.ym.mec.biz.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+public enum PaymentFlagEnum implements BaseEnum<Integer, PaymentFlagEnum> {
+	NO(0,"未缴费"),
+	OPEN(1,"已缴费");
+
+	private Integer code;
+
+	private String desc;
+
+	PaymentFlagEnum(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	@Override
+	public Integer getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+}

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

@@ -754,6 +754,7 @@
         <result property="signOutStatus" column="sign_out_status_"/>
         <result property="settlementTime" column="settlement_time_"/>
         <result property="remark" column="remark_"/>
+        <result property="courseScheduleName" column="course_schedule_name_"/>
     </resultMap>
     <select id="queryMusicGroupCourseSchedule" resultMap="MusicGroupCourseScheduleDto">
         SELECT cs.id_ course_schedule_id_,cs.class_date_,cs.start_class_time_,cs.end_class_time_,cs.class_group_id_,
@@ -773,7 +774,7 @@
     </select>
 
     <select id="queryMusicGroupCourseScheduleDetail" resultMap="MusicGroupCourseScheduleDto">
-        SELECT cs.id_ course_schedule_id_,cs.class_date_,cs.start_class_time_,cs.end_class_time_,cs.class_group_id_,
+        SELECT cs.id_ course_schedule_id_,cs.class_date_,cs.start_class_time_,cs.end_class_time_,cs.class_group_id_,cs.name_ course_schedule_name_,
         cs.type_ course_schedule_type_,cs.status_ course_schedule_status_,cg.name_ course_schedule_name_,
         IF(ta.sign_in_status_ IS NULL,3,ta.sign_in_status_) sign_in_status_,
         IF(ta.sign_out_status_ IS NULL,3,ta.sign_out_status_) sign_out_status_,

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

@@ -970,7 +970,7 @@ public class ExportController extends BaseController {
                 }
             }
             String[] header = {"学员编号", "学员姓名", "性别", "联系电话", "年级", "班级", "专业", "学员状态", "新增学员", "缴费金额",
-                    "下次缴费日期", "报名缴费", "是否激活"};
+                    "下次缴费日期", "是否报名缴费", "是否激活"};
             String[] body = {"userId", "realName", "gender", "phone", "currentGrade", "currentClass", "subjectName", "studentStatus", "isNewStudentStr",
                     "courseFee", "nextPaymentDateStr", "paymentStatus.desc", "activeName"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, musicGroupStudentsDtoPageInfo.getRows());