pengchanglu 3 роки тому
батько
коміт
23fc4117d2
1 змінених файлів з 10 додано та 6 видалено
  1. 10 6
      application/admin/controller/Dashboard.php

+ 10 - 6
application/admin/controller/Dashboard.php

@@ -44,22 +44,26 @@ class Dashboard extends Backend
             //SELECT * ,COUNT(*) AS s   FROM `pi_p_order` WHERE province_id = 1 GROUP BY company_id
             //SELECT c.name,COUNT(*) AS num ,SUM(num) AS sums FROM `pi_p_order` AS o LEFT JOIN `pi_p_company` AS c ON o.`company_id` = c.id  WHERE o.province_id = 1 AND o.createtime>1122 AND o.`createtime`<234 GROUP BY o.company_id
             $pie_filed = 'company_id';
+            $where[$province] = ['in',$this->auth->province_id];
+            $sql_where = 'province_id = '.$this->auth->province_id;
         } elseif (in_array($adminid, $this->_assoc['out'])) {//产地
             $province = 'source_id';
             $pie_filed = 'customer_id';
+            $where[$province] = ['in',$this->auth->province_id];
+            $sql_where = 'source_id = '.$this->auth->province_id;
             //SELECT * ,COUNT(*) AS s   FROM `pi_p_order` WHERE source_id = 1 GROUP BY customer_id
         } else {//屠宰场
-            $province = 'source_id';
+            $province = 'company_id';
             $pie_filed = 'customer_id';
+            $where[$province] = ['in',$this->auth->company_id];
+            $sql_where = 'company_id = '.$this->auth->company_id;
             ////SELECT * ,COUNT(*) AS s   FROM `pi_p_order` WHERE source_id = 1 GROUP BY customer_id
         }
 
-        $where[$province] = ['in',$this->auth->province_id];
-
         //缓存图表
         $key = __FILE__.__FUNCTION__.'orders'.json_encode($adminid);
         $orders = Cache::get($key);
-        //$orders = false;
+        $orders = false;
         if (!$orders) {
             $column = [];
             $starttime = Date::unixtime('day', -6);
@@ -105,7 +109,7 @@ class Dashboard extends Backend
 
 
             //饼图 7
-            $pielist = Db::query('SELECT c.name,COUNT(*) AS num ,SUM(num) AS sums FROM `pi_p_order` AS o LEFT JOIN `pi_p_company` AS c ON o.`'.$pie_filed.'` = c.id  WHERE o.province_id = 1 AND o.leavetime>='.$starttime.' AND o.`leavetime`<'.$endtime.' GROUP BY o.`'.$pie_filed.'` ;');
+            $pielist = Db::query('SELECT c.name,COUNT(*) AS num ,SUM(num) AS sums FROM `pi_p_order` AS o LEFT JOIN `pi_p_company` AS c ON o.`'.$pie_filed.'` = c.id  WHERE o.'.$sql_where.' AND o.leavetime>='.$starttime.' AND o.`leavetime`<'.$endtime.' GROUP BY o.`'.$pie_filed.'` ;');
 
             $piecolumn = [];
             $piedata = [];
@@ -121,7 +125,7 @@ class Dashboard extends Backend
 
             //饼图 30
             $starttime30 = Date::unixtime('day', -29);
-            $pielist30 = Db::query('SELECT c.name,COUNT(*) AS num ,SUM(num) AS sums FROM `pi_p_order` AS o LEFT JOIN `pi_p_company` AS c ON o.`'.$pie_filed.'` = c.id  WHERE o.province_id = 1 AND o.leavetime>='.$starttime30.' AND o.`leavetime`<'.$endtime.' GROUP BY o.`'.$pie_filed.'` ;');
+            $pielist30 = Db::query('SELECT c.name,COUNT(*) AS num ,SUM(num) AS sums FROM `pi_p_order` AS o LEFT JOIN `pi_p_company` AS c ON o.`'.$pie_filed.'` = c.id  WHERE o.'.$sql_where.' AND o.leavetime>='.$starttime30.' AND o.`leavetime`<'.$endtime.' GROUP BY o.`'.$pie_filed.'` ;');
 
             $piecolumn30 = [];
             $piedata30 = [];