From 65c3031fc83eef7b9cb22ca1de55dae338c347c8 Mon Sep 17 00:00:00 2001
From: lcc <805383944@qq.com>
Date: Wed, 8 Jan 2025 15:28:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=88=E5=BC=80=E5=B7=A5?=
 =?UTF-8?q?=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/views/receiver/report/lists.php | 3 ++-
 api/controllers/plan/Report.php       | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/admin/views/receiver/report/lists.php b/admin/views/receiver/report/lists.php
index 8b4be0ca..ba145b5c 100644
--- a/admin/views/receiver/report/lists.php
+++ b/admin/views/receiver/report/lists.php
@@ -67,7 +67,7 @@
                         <td rowspan="2" style="vertical-align: middle;"><?= $v['biz_name'] ?></td>
                         <td rowspan="2" style="vertical-align: middle;"><?= $v['day'] ?></td>
                         <td rowspan="2" style="vertical-align: middle;"><?= $v['sales'] ?></td>
-                        <td rowspan="2" style="vertical-align: middle;"><?= intval($v['work_per']) ?>%</td>
+                        <td><?= intval($v['work_per']) ?>%</td>
                         <td><?= $v['cust_new'] ?></td>
                         <td><?= $v['cust_push'] ?></td>
                         <td><?= $v['cust_visit'] ?></td>
@@ -81,6 +81,7 @@
                         <td>今日</td>
                     </tr>
                     <tr>
+                        <td><?= intval($v['work_per_month']) ?>%</td>
                         <td><?= $v['cust_month'] ?></td>
                         <td><?= $v['cust_push_month'] ?></td>
                         <td><?= $v['cust_visit_month'] ?></td>
diff --git a/api/controllers/plan/Report.php b/api/controllers/plan/Report.php
index f07f766a..fa1659c4 100644
--- a/api/controllers/plan/Report.php
+++ b/api/controllers/plan/Report.php
@@ -96,6 +96,8 @@ class Report extends HD_Controller
 
                 //今日线索逾期数
                 $cust_delay = $this->receiver_score_log_model->count(array('day' => $day, 'biz_id' => $v['id'], 'type' => 3, 'sub_type' => 3, 'target_id >' => 0));
+                //本月开工
+                $works_month = $this->receiver_score_log_model->count(array('MONTH(day)' => $month, 'biz_id' => $v['id'], 'type' => 0, 'sub_type' => 0, 'score >' => 0));
 
                 //本月线索逾期数
                 $cust_delay_month = $this->receiver_score_log_model->count(array('MONTH(day)' => $month, 'biz_id' => $v['id'], 'type' => 3, 'sub_type' => 3, 'target_id >' => 0));
@@ -143,6 +145,7 @@ class Report extends HD_Controller
                     'order_early' => $order_early,
                     'score' => round($score['score']),
 
+                    'work_per_month' => number_format($works_month / $sales, 2) * 100,
                     'cust_month' => $cust_month,
                     'cust_push_month' => $cust_push_month,
                     'cust_visit_month' => $cust_visit_month,