|
@@ -2271,7 +2271,6 @@
|
|
|
<if test="collectSampleId != null and collectSampleId != '' ">
|
|
|
and collect_sample_id = #{collectSampleId}
|
|
|
</if>
|
|
|
-
|
|
|
group by collect_sample_id) ttt on t.collectSampleId = ttt.user_id
|
|
|
left join (select collect_sample_id as 'user_id',
|
|
|
count(1) as 'sendTotalCount',
|
|
@@ -2282,6 +2281,14 @@
|
|
|
<if test="collectSampleId != null and collectSampleId != '' ">
|
|
|
and collect_sample_id = #{collectSampleId}
|
|
|
</if>
|
|
|
+ <if test="bindStartDate != null and bindStartDate != '' ">
|
|
|
+ and create_time >= str_to_date(concat(date_format(#{bindStartDate}, '%Y-%m-%d'), '00:00:01'),
|
|
|
+ '%Y-%m-%d %H:%i:%s')
|
|
|
+ </if>
|
|
|
+ <if test="bindEndDate != null and bindEndDate != '' ">
|
|
|
+ and create_time <= str_to_date(concat(date_format(#{bindEndDate}, '%Y-%m-%d'), '23:59:59'), '%Y-%m-%d
|
|
|
+ %H:%i:%s')
|
|
|
+ </if>
|
|
|
group by collect_sample_id) tttt on t.collectSampleId = tttt.user_id
|
|
|
left join (select user_id, promoters_count
|
|
|
from user_promoters_count
|