学员vip课列表修改

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

@@ -16,10 +16,30 @@ public class StudentManageVipGroupClassDto {
 
     private Integer studentNum;
 
+    private Integer currentClassTimes;
+
+    private Integer totalClassTimes;
+
     private String activeName;
 
     private Date courseStartDate;
 
+    public Integer getCurrentClassTimes() {
+        return currentClassTimes;
+    }
+
+    public void setCurrentClassTimes(Integer currentClassTimes) {
+        this.currentClassTimes = currentClassTimes;
+    }
+
+    public Integer getTotalClassTimes() {
+        return totalClassTimes;
+    }
+
+    public void setTotalClassTimes(Integer totalClassTimes) {
+        this.totalClassTimes = totalClassTimes;
+    }
+
     public Long getVipGroupId() {
         return vipGroupId;
     }

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

@@ -478,9 +478,12 @@
         <result property="studentNum" column="student_num_"/>
         <result property="activeName" column="name_"/>
         <result property="courseStartDate" column="courses_start_date"/>
+        <result property="currentClassTimes" column="current_class_times_"/>
+        <result property="totalClassTimes" column="total_class_times_"/>
     </resultMap>
     <select id="findStudentVipGroupClass" resultMap="StudentManageVipGroupClassDto">
-        SELECT vg.id_,vg.name_ vip_group_name_,vg.status_,cgtm.user_id_,cg.student_num_,vgc.name_,vg.courses_start_date
+        SELECT vg.id_,vg.name_ vip_group_name_,vg.status_,cgtm.user_id_,cg.student_num_,
+        vgc.name_,vg.courses_start_date,cg.current_class_times_,cg.total_class_times_
         FROM class_group_student_mapper cgsm
         LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
         LEFT JOIN vip_group vg ON cg.music_group_id_ = vg.id_

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

@@ -110,41 +110,29 @@
 	</select>
 
     <select id="findStudentVipGroups" resultMap="studentManageVipGroup">
-        SELECT cs.teach_mode_,su.real_name_,cg.student_num_,cg.total_class_times_,cg.current_class_times_,
-        CONCAT(cs.class_date_," ",cs.start_class_time_) course_date_,cg.id_ class_group_id_,cg.name_ class_group_name_,cs.status_ course_status_
-        FROM vip_group vg
-        LEFT JOIN class_group cg ON cg.music_group_id_ = vg.id_
-        LEFT JOIN course_schedule cs ON cs.music_group_id_ = vg.id_
-        LEFT JOIN sys_user su ON su.id_ = cs.actual_teacher_id_
-        LEFT JOIN class_group_student_mapper cgsm ON cgsm.music_group_id_ = vg.id_
-        <where>
-            vg.audit_status_ = 'PASS' AND cs.id_ IS NOT NULL AND cgsm.status_ != 'QUIT' AND cg.group_type_ = 'VIP'
-            <if test="studentId != null">
-                AND cgsm.user_id_ = #{studentId}
-            </if>
-            <if test="classGroupName != null">
-                AND cg.name_ LIKE CONCAT('%',#{classGroupName},'%')
-            </if>
-        </where>
-        ORDER BY cs.class_date_,cs.start_class_time_
+        SELECT CONCAT(cs.class_date_," ",cs.start_class_time_) course_date_,cs.teach_mode_,cs.status_ course_status_,cs.name_ class_group_name_
+        FROM course_schedule cs
+        WHERE cs.group_type_ = 'VIP'
+        <if test="vipGroupId != null">
+            AND cs.music_group_id_ = #{vipGroupId}
+        </if>
+        <if test="classGroupName != null">
+            AND cs.name_ LIKE CONCAT('%',#{classGroupName},'%')
+        </if>
+        ORDER BY course_date_
         <include refid="global.limit"/>
     </select>
 
     <select id="countStudentVipGroups" resultType="java.lang.Integer">
         SELECT COUNT(cs.id_)
-        FROM vip_group vg
-        LEFT JOIN class_group cg ON cg.music_group_id_ = vg.id_
-        LEFT JOIN course_schedule cs ON cs.music_group_id_ = vg.id_
-        LEFT JOIN class_group_student_mapper cgsm ON cgsm.music_group_id_ = vg.id_
-        <where>
-            vg.audit_status_ = 'PASS' AND cs.id_ IS NOT NULL AND cgsm.status_ != 'QUIT' AND cg.group_type_ = 'VIP'
-            <if test="studentId != null">
-                AND cgsm.user_id_ = #{studentId}
-            </if>
-            <if test="classGroupName != null">
-                AND cg.name_ LIKE CONCAT('%',#{classGroupName},'%')
-            </if>
-        </where>
+        FROM course_schedule cs
+        WHERE cs.group_type_ = 'VIP'
+        <if test="vipGroupId != null">
+            AND cs.music_group_id_ = #{vipGroupId}
+        </if>
+        <if test="classGroupName != null">
+            AND cs.name_ LIKE CONCAT('%',#{classGroupName},'%')
+        </if>
     </select>
 
     <!-- 全查询 -->