|
@@ -381,7 +381,7 @@
|
|
|
<select id="countAddStudentNum" resultType="java.lang.Integer">
|
|
|
SELECT COUNT(DISTINCT ss.user_id_) FROM student_statistics ss
|
|
|
LEFT JOIN student_basic_info sbi ON sbi.user_id_ = ss.user_id_
|
|
|
- WHERE ss.group_type_ = #{groupType} AND ss.first_order_time_ BETWEEN #{startDate} AND #{endDate}
|
|
|
+ WHERE ss.group_type_ = #{groupType} AND DATE_FORMAT(ss.first_order_time_, '%Y-%m-%d') BETWEEN #{startDate} AND #{endDate}
|
|
|
<if test="organIdList != null and organIdList.size > 0">
|
|
|
AND sbi.organ_id_ IN
|
|
|
<foreach collection="organIdList" item="organId" open="(" close=")" separator=",">
|
|
@@ -395,20 +395,20 @@
|
|
|
SELECT cssp.user_id_,MIN(vg.create_time_) first_order_time_ FROM course_schedule_student_payment cssp
|
|
|
LEFT JOIN vip_group vg ON vg.id_ = cssp.music_group_id_
|
|
|
LEFT JOIN vip_group_category vgc ON vgc.id_ = vg.vip_group_category_id_
|
|
|
- WHERE cssp.actual_price_ > 0 AND cssp.group_type_ = 'VIP' AND vgc.music_theory_ = 0 AND vg.create_time_ BETWEEN #{startDate} AND #{endDate}
|
|
|
+ WHERE cssp.actual_price_ > 0 AND cssp.group_type_ = 'VIP' AND vgc.music_theory_ = 0 AND DATE_FORMAT(vg.create_time_, '%Y-%m-%d') BETWEEN #{startDate} AND #{endDate}
|
|
|
GROUP BY cssp.user_id_
|
|
|
</if>
|
|
|
<if test="groupType == 'THEORY'">
|
|
|
SELECT cssp.user_id_,MIN(vg.create_time_) first_order_time_ FROM course_schedule_student_payment cssp
|
|
|
LEFT JOIN vip_group vg ON vg.id_ = cssp.music_group_id_
|
|
|
LEFT JOIN vip_group_category vgc ON vgc.id_ = vg.vip_group_category_id_
|
|
|
- WHERE cssp.actual_price_ > 0 AND cssp.group_type_ = 'VIP' AND vgc.music_theory_ AND vg.create_time_ BETWEEN #{startDate} AND #{endDate}
|
|
|
+ WHERE cssp.actual_price_ > 0 AND cssp.group_type_ = 'VIP' AND vgc.music_theory_ AND DATE_FORMAT(vg.create_time_, '%Y-%m-%d') BETWEEN #{startDate} AND #{endDate}
|
|
|
GROUP BY cssp.user_id_
|
|
|
</if>
|
|
|
<if test="groupType == 'PRACTICE'">
|
|
|
SELECT cssp.user_id_,MIN(pg.create_time_) first_order_time_ FROM course_schedule_student_payment cssp
|
|
|
LEFT JOIN practice_group pg ON pg.id_ = cssp.music_group_id_
|
|
|
- WHERE cssp.actual_price_ > 0 AND cssp.group_type_ = 'PRACTICE' AND pg.create_time_ BETWEEN #{startDate} AND #{endDate}
|
|
|
+ WHERE cssp.actual_price_ > 0 AND cssp.group_type_ = 'PRACTICE' AND DATE_FORMAT(pg.create_time_, '%Y-%m-%d') BETWEEN #{startDate} AND #{endDate}
|
|
|
GROUP BY cssp.user_id_
|
|
|
</if> ) cssp
|
|
|
LEFT JOIN student_statistics ss ON cssp.user_id_ = ss.user_id_
|