Merge branch 'dev_20200908_PEP_Statistics' into dev

yd-api/src/main/resources/mapper/marketing/ScheduleTrackMapper.xml

@@ -83,7 +83,7 @@
         SELECT count(1)
         SELECT count(1)
         FROM ag_mkt_schedule_task_tracking
         FROM ag_mkt_schedule_task_tracking
         WHERE 1=1
         WHERE 1=1
-            AND to_days(track_time) = to_days(#{taskTimeEnd,jdbcType=TIMESTAMP})
+            AND to_days(track_time) = to_days(#{trackTime,jdbcType=TIMESTAMP})
             AND practitioner_id = #{practitionerId,jdbcType=BIGINT}
             AND practitioner_id = #{practitionerId,jdbcType=BIGINT}
             AND (task_time_from < STR_TO_DATE(#{taskTimeEnd,jdbcType=VARCHAR}, '%H:%i:%s')
             AND (task_time_from < STR_TO_DATE(#{taskTimeEnd,jdbcType=VARCHAR}, '%H:%i:%s')
 	            AND task_time_end > STR_TO_DATE(#{taskTimeFrom,jdbcType=VARCHAR}, '%H:%i:%s')
 	            AND task_time_end > STR_TO_DATE(#{taskTimeFrom,jdbcType=VARCHAR}, '%H:%i:%s')