作者 刘锟

update

@@ -540,8 +540,8 @@ class InquiryForwardLogic extends BaseLogic @@ -540,8 +540,8 @@ class InquiryForwardLogic extends BaseLogic
540 foreach ($manage_ids as $mid) { 540 foreach ($manage_ids as $mid) {
541 $name = $manageModel->getName($mid); 541 $name = $manageModel->getName($mid);
542 $month_count = intval(ForwardCount::where('manage_id', $mid)->where('year', $year)->where('month', $month)->sum('count') ?? 0); 542 $month_count = intval(ForwardCount::where('manage_id', $mid)->where('year', $year)->where('month', $month)->sum('count') ?? 0);
543 - $data_month[$last_year_month][$name] = $month_count;  
544 $data_month['total'][$name] = ($data_month['total'][$name] ?? 0) + $month_count; 543 $data_month['total'][$name] = ($data_month['total'][$name] ?? 0) + $month_count;
  544 + $data_month[$last_year_month][$name] = $month_count;
545 } 545 }
546 546
547 $last_year_month = date('Y-m', strtotime($last_year_month . ' +1 month')); 547 $last_year_month = date('Y-m', strtotime($last_year_month . ' +1 month'));
@@ -560,8 +560,8 @@ class InquiryForwardLogic extends BaseLogic @@ -560,8 +560,8 @@ class InquiryForwardLogic extends BaseLogic
560 foreach ($manage_ids as $mid) { 560 foreach ($manage_ids as $mid) {
561 $name = $manageModel->getName($mid); 561 $name = $manageModel->getName($mid);
562 $day_count = ForwardCount::where('manage_id', $mid)->where('year', $year)->where('month', $month)->where('day', $day)->value('count') ?? 0; 562 $day_count = ForwardCount::where('manage_id', $mid)->where('year', $year)->where('month', $month)->where('day', $day)->value('count') ?? 0;
563 - $data_week[substr($last_week_day, 5)][$name] = $day_count;  
564 $data_week['total'][$name] = ($data_week['total'][$name] ?? 0) + $day_count; 563 $data_week['total'][$name] = ($data_week['total'][$name] ?? 0) + $day_count;
  564 + $data_week[substr($last_week_day, 5)][$name] = $day_count;
565 } 565 }
566 566
567 $last_week_day = date('Y-m-d', strtotime($last_week_day . ' +1 day')); 567 $last_week_day = date('Y-m-d', strtotime($last_week_day . ' +1 day'));