|
@@ -187,7 +187,7 @@ FROM
|
187
|
187
|
<if test="startDate != null or endDate != null">
|
188
|
188
|
a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
|
189
|
189
|
</if>
|
190
|
|
-
|
|
190
|
+ order by date asc
|
191
|
191
|
) AS temp_date
|
192
|
192
|
|
193
|
193
|
LEFT JOIN (
|
|
@@ -213,8 +213,9 @@ FROM
|
213
|
213
|
</if>
|
214
|
214
|
|
215
|
215
|
GROUP BY tpvr.event_type, DATE_FORMAT( tpvr.visit_time , '%Y-%m-%d' )
|
|
216
|
+ order by date asc
|
216
|
217
|
) AS temp ON temp_date.date = temp.date and temp_date.type_id = temp.event_type
|
217
|
|
- order by temp.date asc
|
|
218
|
+ order by temp_date.date asc
|
218
|
219
|
</select>
|
219
|
220
|
|
220
|
221
|
<select id="selectActiveUserCount" resultType="map">
|