|
|
@@ -442,9 +442,11 @@
|
|
|
<result property="subCourseNum" column="sub_course_num_"/>
|
|
|
</resultMap>
|
|
|
<select id="queryActivityStudentList" resultMap="ActivityUserDto">
|
|
|
- SELECT aum.user_id_,su.avatar_,sj.id_ subject_id_,su.username_,su.phone_,sj.name_ subject_name_,SUM(aum.sub_course_num_) sub_course_num_
|
|
|
- FROM (SELECT aum.id_,aum.user_id_,aum.sub_course_num_,
|
|
|
- aum.single_course_time_,case when category_id_ IS NULL THEN 'PRACTICE' ELSE 'VIP' END type_ from activity_user_mapper aum
|
|
|
+ SELECT aum.user_id_,su.avatar_,sj.id_ subject_id_,su.username_,su.phone_,sj.name_ subject_name_,aum.sub_course_num_
|
|
|
+ FROM (
|
|
|
+ select aum.id_,aum.user_id_,SUM(aum.sub_course_num_) sub_course_num_,aum.single_course_time_,aum.type_ from (
|
|
|
+ SELECT aum.id_,aum.user_id_,aum.sub_course_num_,
|
|
|
+ aum.single_course_time_,case when category_id_ IS NULL THEN 'PRACTICE' ELSE 'VIP' END type_ from activity_user_mapper aum
|
|
|
WHERE aum.sub_course_num_ > 0 AND aum.return_fee_ = 0
|
|
|
<if test="queryInfo.categoryId != null">
|
|
|
AND aum.category_id_ = #{queryInfo.categoryId}
|
|
|
@@ -454,7 +456,7 @@
|
|
|
</if>
|
|
|
UNION ALL
|
|
|
SELECT aum.id_,aum.user_id_,aum.sub_give_course_num_ sub_course_num_,
|
|
|
- aum.give_single_course_time_ single_course_time_,case when give_category_id_ IS NULL THEN 'PRACTICE' ELSE 'VIP' END type_ from activity_user_mapper aum
|
|
|
+ aum.give_single_course_time_ single_course_time_,case when give_category_id_ IS NULL THEN 'PRACTICE' ELSE 'VIP' END type_ from activity_user_mapper aum
|
|
|
WHERE aum.sub_give_course_num_ > 0 AND aum.return_fee_ = 0
|
|
|
<if test="queryInfo.categoryId != null">
|
|
|
AND aum.give_category_id_ = #{queryInfo.categoryId}
|
|
|
@@ -463,6 +465,8 @@
|
|
|
AND aum.give_category_id_ IS NULL
|
|
|
</if>
|
|
|
) aum
|
|
|
+ group by aum.user_id_
|
|
|
+ ) aum
|
|
|
<if test="queryInfo.teacherId != null">
|
|
|
left join student_teacher_mapper stm ON stm.student_id_ = aum.user_id_
|
|
|
</if>
|
zouxuan