|
@@ -50,8 +50,7 @@
|
50
|
50
|
select ifnull(tp.from_num, 0) as from_num , ifnull(tp.registered_num, 0) AS registered_num , ifnull(tp.create_time, date.date) AS create_time, ifnull(tp.scene_type, 'other') as scene_type from (
|
51
|
51
|
|
52
|
52
|
SELECT
|
53
|
|
- DATE_FORMAT(
|
54
|
|
- DATE_ADD( STR_TO_DATE(#{startDate}, '%Y-%m-%d' ), INTERVAL rownum DAY ), '%Y-%m-%d' ) AS date
|
|
53
|
+ DATE_FORMAT( DATE_SUB( now( ), INTERVAL rownum DAY ), '%Y-%m-%d' ) AS date
|
55
|
54
|
FROM sequence
|
56
|
55
|
WHERE rownum < DATEDIFF(STR_TO_DATE( #{endDate}, '%Y-%m-%d' ), STR_TO_DATE( #{startDate}, '%Y-%m-%d' )) ) as date
|
57
|
56
|
|
|
@@ -73,8 +72,7 @@
|
73
|
72
|
select ifnull(tp.from_num, 0) as from_num , ifnull(tp.registered_num, 0) AS registered_num , ifnull(tp.create_time, date.date) AS create_time, ifnull(tp.scene_type, 'other') as scene_type from (
|
74
|
73
|
|
75
|
74
|
SELECT
|
76
|
|
- DATE_FORMAT(
|
77
|
|
- DATE_ADD( STR_TO_DATE(#{startDate}, '%Y-%m-%d' ), INTERVAL rownum DAY ), '%Y-%m-%d' ) AS date
|
|
75
|
+ DATE_FORMAT( DATE_SUB( now( ), INTERVAL rownum DAY ), '%Y-%m-%d' ) AS date
|
78
|
76
|
FROM sequence
|
79
|
77
|
WHERE rownum < DATEDIFF(STR_TO_DATE( #{endDate}, '%Y-%m-%d' ), STR_TO_DATE( #{startDate}, '%Y-%m-%d' )) ) as date
|
80
|
78
|
|
|
@@ -99,5 +97,6 @@
|
99
|
97
|
DATE_FORMAT( tp.create_date, '%Y-%m-%d' )
|
100
|
98
|
ORDER BY tp.create_date
|
101
|
99
|
) as tp on date.date = tp.create_time
|
|
100
|
+ order by date.date
|
102
|
101
|
</select>
|
103
|
102
|
</mapper>
|