|
@@ -764,7 +764,7 @@
|
764
|
764
|
<if test="startDate == null or endDate == null">
|
765
|
765
|
AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
|
766
|
766
|
</if>
|
767
|
|
- GROUP BY t.person_id, t.target_type
|
|
767
|
+ GROUP BY t.person_id
|
768
|
768
|
) as temp4 GROUP BY DATE_FORMAT(temp4.create_date,'%Y-%m-%d')
|
769
|
769
|
) AS temp4 ON temp_date.date = DATE_FORMAT( temp4.create_date, '%Y-%m-%d' )
|
770
|
770
|
GROUP BY date
|
|
@@ -999,7 +999,7 @@
|
999
|
999
|
<if test="startDate == null or endDate == null">
|
1000
|
1000
|
AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
|
1001
|
1001
|
</if>
|
1002
|
|
- GROUP BY t.person_id, t.target_type
|
|
1002
|
+ GROUP BY t.person_id
|
1003
|
1003
|
) as temp4 GROUP BY DATE_FORMAT(temp4.create_date,'%Y-%m-%d')
|
1004
|
1004
|
) AS temp4 ON temp_date.date = DATE_FORMAT( temp4.create_date, '%Y-%m-%d' )
|
1005
|
1005
|
GROUP BY date
|