会员试用

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

@@ -108,6 +108,36 @@ public class StudentManageListDto {
 
     private String activityCourseDetail;
 
+    private Integer membershipDay;
+
+    private Integer experienceMembershipDay;
+
+    private Date experienceMembershipEndTime;
+
+    public Integer getMembershipDay() {
+        return membershipDay;
+    }
+
+    public void setMembershipDay(Integer membershipDay) {
+        this.membershipDay = membershipDay;
+    }
+
+    public Integer getExperienceMembershipDay() {
+        return experienceMembershipDay;
+    }
+
+    public void setExperienceMembershipDay(Integer experienceMembershipDay) {
+        this.experienceMembershipDay = experienceMembershipDay;
+    }
+
+    public Date getExperienceMembershipEndTime() {
+        return experienceMembershipEndTime;
+    }
+
+    public void setExperienceMembershipEndTime(Date experienceMembershipEndTime) {
+        this.experienceMembershipEndTime = experienceMembershipEndTime;
+    }
+
     public Integer getMemberRankSettingId() {
         return memberRankSettingId;
     }

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

@@ -74,6 +74,9 @@
         <result column="cooperation_organ_name_" property="cooperationOrganName"/>
         <result column="membership_end_time_" property="membershipEndTime"/>
         <result column="activity_course_detail_" property="activityCourseDetail"/>
+        <result column="membership_day_" property="membershipDay"/>
+        <result column="experience_membership_day_" property="experienceMembershipDay"/>
+        <result column="experience_membership_end_time_" property="experienceMembershipEndTime"/>
     </resultMap>
 
     <sql id="queryCondition">
@@ -543,7 +546,7 @@
         sr.current_class_,sr.music_group_status_ student_status_,sr.payment_status_,sr.subject_id_ reg_subject_id_,rs.name_ regSubjectName,sr.remark_,
         sr.actual_subject_id_ subject_id_,s.name_ subject_name_,sr.music_group_id_,CASE WHEN su.password_ IS NULL THEN 0 ELSE 1 END isActive_,
         IF(DATE_FORMAT(sr.create_time_,'%Y-%m-%d') > DATE_FORMAT(mg.payment_expire_date_,'%Y-%m-%d'),1,0) is_new_student_,
-        stu.care_package_,stu.come_on_package_,sr.create_time_ registerTime,sr.membership_end_time_ music_membership_end_time_,s.membership_end_time_,s.experience_membership_end_time_
+        stu.care_package_,stu.come_on_package_,sr.create_time_ registerTime,sr.membership_end_time_ music_membership_end_time_,stu.membership_end_time_,stu.experience_membership_end_time_
         FROM student_registration sr
         LEFT JOIN sys_user su ON sr.user_id_ = su.id_
         LEFT JOIN subject s ON s.id_ = sr.actual_subject_id_