Merge branch 'dev_20200908_PEP_Statistics' into dev

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

@@ -202,6 +202,7 @@
             created_at, created_by, updated_at, updated_by, updator_type, creator_type
         from ag_mkt_schedule_task_tracking t
         where t.practitioner_id = #{practitionerId,jdbcType=BIGINT}
+          and md_drop_option_id not in (223,224,225,226,227)
           and to_days(t.track_time) <= to_days(now())
         <if test="time != null">
             <choose>
@@ -216,6 +217,15 @@
                 </when>
             </choose>
         </if>
+        union all
+        select id, notice, task_type, refer_leads_id, refer_potential_id,
+            task_important_tag, task_routine_at_week7,task_routine_at_week6, task_routine_at_week5,
+            task_routine_at_week4, task_routine_at_week3, task_routine_at_week2, task_routine_at_week1,
+            task_time_from, task_time_end, is_active, practitioner_id, customer_id, md_drop_option_id, track_score, track_time,
+            created_at, created_by, updated_at, updated_by, updator_type, creator_type
+            from ag_mkt_schedule_task_tracking t
+        where t.practitioner_id = #{practitionerId,jdbcType=BIGINT}
+            and md_drop_option_id in (223,224,225,226,227)
     </select>
 
     <delete id="deleteScheduleTrackById">