正在显示
1 个修改的文件
包含
8 行增加
和
8 行删除
| @@ -532,7 +532,7 @@ class InquiryForwardLogic extends BaseLogic | @@ -532,7 +532,7 @@ class InquiryForwardLogic extends BaseLogic | ||
| 532 | 532 | ||
| 533 | //月统计 | 533 | //月统计 |
| 534 | $last_year_month = date('Y-m', strtotime('-11 months')); | 534 | $last_year_month = date('Y-m', strtotime('-11 months')); |
| 535 | - $manage_ids = ForwardCount::select('manage_id')->where('created_at', '>', $last_year_month . '-02')->where('count', '>', 0)->orderBy('manage_id', 'asc')->distinct()->pluck('manage_id')->toArray(); | 535 | + $month_manage_ids = ForwardCount::select('manage_id')->where('created_at', '>', $last_year_month . '-02')->where('count', '>', 0)->orderBy('manage_id', 'asc')->distinct()->pluck('manage_id')->toArray(); |
| 536 | 536 | ||
| 537 | $data_month = []; | 537 | $data_month = []; |
| 538 | $data_month_total = []; | 538 | $data_month_total = []; |
| @@ -542,9 +542,9 @@ class InquiryForwardLogic extends BaseLogic | @@ -542,9 +542,9 @@ class InquiryForwardLogic extends BaseLogic | ||
| 542 | $year = $month_arr[0]; | 542 | $year = $month_arr[0]; |
| 543 | $month = $month_arr[1]; | 543 | $month = $month_arr[1]; |
| 544 | 544 | ||
| 545 | - foreach ($manage_ids as $mid) { | ||
| 546 | - $name = $manageModel->getName($mid); | ||
| 547 | - $month_count = intval(ForwardCount::where('manage_id', $mid)->where('year', $year)->where('month', $month)->sum('count') ?? 0); | 545 | + foreach ($month_manage_ids as $month_mid) { |
| 546 | + $name = $manageModel->getName($month_mid); | ||
| 547 | + $month_count = intval(ForwardCount::where('manage_id', $month_mid)->where('year', $year)->where('month', $month)->sum('count') ?? 0); | ||
| 548 | $data_month_total[$name] = ($data_month_total[$name] ?? 0) + $month_count; | 548 | $data_month_total[$name] = ($data_month_total[$name] ?? 0) + $month_count; |
| 549 | $data_month[$last_year_month][$name] = $month_count; | 549 | $data_month[$last_year_month][$name] = $month_count; |
| 550 | } | 550 | } |
| @@ -556,7 +556,7 @@ class InquiryForwardLogic extends BaseLogic | @@ -556,7 +556,7 @@ class InquiryForwardLogic extends BaseLogic | ||
| 556 | 556 | ||
| 557 | //周统计 | 557 | //周统计 |
| 558 | $last_week_day = date('Y-m-d', strtotime('-1 week')); | 558 | $last_week_day = date('Y-m-d', strtotime('-1 week')); |
| 559 | - $manage_ids = ForwardCount::select('manage_id')->where('created_at', '>', $last_week_day . ' +1 day')->where('count', '>', 0)->orderBy('manage_id', 'asc')->distinct()->pluck('manage_id')->toArray(); | 559 | + $week_manage_ids = ForwardCount::select('manage_id')->where('created_at', '>', $last_week_day . ' +1 day')->where('count', '>', 0)->orderBy('manage_id', 'asc')->distinct()->pluck('manage_id')->toArray(); |
| 560 | 560 | ||
| 561 | $data_week = []; | 561 | $data_week = []; |
| 562 | $data_week_total = []; | 562 | $data_week_total = []; |
| @@ -567,9 +567,9 @@ class InquiryForwardLogic extends BaseLogic | @@ -567,9 +567,9 @@ class InquiryForwardLogic extends BaseLogic | ||
| 567 | $month = $day_arr[1]; | 567 | $month = $day_arr[1]; |
| 568 | $day = $day_arr[2]; | 568 | $day = $day_arr[2]; |
| 569 | 569 | ||
| 570 | - foreach ($manage_ids as $mid) { | ||
| 571 | - $name = $manageModel->getName($mid); | ||
| 572 | - $day_count = ForwardCount::where('manage_id', $mid)->where('year', $year)->where('month', $month)->where('day', $day)->value('count') ?? 0; | 570 | + foreach ($week_manage_ids as $week_mid) { |
| 571 | + $name = $manageModel->getName($week_mid); | ||
| 572 | + $day_count = ForwardCount::where('manage_id', $week_mid)->where('year', $year)->where('month', $month)->where('day', $day)->value('count') ?? 0; | ||
| 573 | $data_week_total[$name] = ($data_week_total[$name] ?? 0) + $day_count; | 573 | $data_week_total[$name] = ($data_week_total[$name] ?? 0) + $day_count; |
| 574 | $data_week[substr($last_week_day, 5)][$name] = $day_count; | 574 | $data_week[substr($last_week_day, 5)][$name] = $day_count; |
| 575 | } | 575 | } |
-
请 注册 或 登录 后发表评论