PEP本周分值

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

@@ -107,8 +107,12 @@
                 p.mobile_no,
                 p.mobile_no,
                 p.customer_id,
                 p.customer_id,
                 sum(case when to_days(t.track_time) = to_days(now()) then COALESCE(t.track_score,0) else 0 end) dayScore,
                 sum(case when to_days(t.track_time) = to_days(now()) then COALESCE(t.track_score,0) else 0 end) dayScore,
-                sum(case when YEARWEEK(date_format(t.track_time,'%Y-%m-%d'),1) = YEARWEEK(now(),1) then COALESCE(t.track_score,0) else 0 end) weekScore,
-                sum(case when date_format(t.track_time,'%Y-%m')=date_format(now(),'%Y-%m') then COALESCE(t.track_score,0) else 0 end) monthScore
+                sum(case when YEARWEEK(date_format(t.track_time,'%Y-%m-%d'),1) = YEARWEEK(now(),1)
+                            and to_days(t.track_time) <= to_days(now())
+                            then COALESCE(t.track_score,0) else 0 end) weekScore,
+                sum(case when date_format(t.track_time,'%Y-%m')=date_format(now(),'%Y-%m')
+                            and to_days(t.track_time) <= to_days(now())
+                            then COALESCE(t.track_score,0) else 0 end) monthScore
            from ag_acl_practitioner p
            from ag_acl_practitioner p
             left join (select practitioner_id, track_time, track_score
             left join (select practitioner_id, track_time, track_score
                         from ag_mkt_schedule_task_tracking where md_drop_option_id not in (223,224,225,226,227)
                         from ag_mkt_schedule_task_tracking where md_drop_option_id not in (223,224,225,226,227)