活动排课

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

@@ -63,6 +63,16 @@ public class StudentVipGroupShowListDto {
 
     private Date createTime;
 
+    private String groupType;
+
+    public String getGroupType() {
+        return groupType;
+    }
+
+    public void setGroupType(String groupType) {
+        this.groupType = groupType;
+    }
+
     public Date getCreateTime() {
         return createTime;
     }

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

@@ -800,7 +800,7 @@
     <select id="findPracticeGroups" resultMap="com.ym.mec.biz.dal.dao.VipGroupDao.studentVipGroup">
         SELECT pg.id_,pg.name_,pg.single_class_minutes_,pg.payment_expire_date_,pg.courses_expire_date_,
         pg.courses_start_date_,pg.course_num_ online_classes_num_,pg.total_price_,cg.expect_student_num_,
-        cg.student_num_,su.real_name_ teacher_name_,su.avatar_,pg.create_time_
+        cg.student_num_,su.real_name_ teacher_name_,su.avatar_,pg.create_time_,'PRACTICE' group_type_
         FROM practice_group pg
         LEFT JOIN class_group cg ON pg.id_ = cg.music_group_id_ AND cg.group_type_ = 'PRACTICE'
         LEFT JOIN teacher t ON pg.user_id_ = t.id_

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

@@ -123,6 +123,7 @@
         <result column="category_name_" property="categoryName"/>
         <result property="courseStartDate" column="courses_start_date"/>
         <result property="createTime" column="create_time_"/>
+        <result property="groupType" column="group_type_"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -393,7 +394,8 @@
         su.avatar_,
         t.introduction_,
         vga.type_,
-        vgc.name_ category_name_,vg.create_time_
+        vgc.name_ category_name_,vg.create_time_,
+        'VIP' group_type_
         FROM
         vip_group vg
         LEFT JOIN class_group cg ON vg.id_=cg.music_group_id_ AND cg.group_type_ = 'VIP'