ad

app/admin/controller/Report.php

@@ -216,10 +216,8 @@ class Report extends Base
     {
         $param = $this->request->only([
             'token',
-            'start_date' => '',
-            'end_date' => '',
-            'page' => 1,
-            'size' => 15,
+            'start_date' =>date('Y-m-01'),
+            'end_date' => date('Y-m-d'),
         ], 'post', 'trim');
 
         $val_params = Validate::rule([
@@ -232,31 +230,39 @@ class Report extends Base
         $where = [['a.is_del', '=', 0]];
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['a.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
 
-        $count = Db::name('consult_info')
-            ->alias('a')
-            ->field('DATE_FORMAT(a.addtime,"%Y-%m-%d") addtime,cii.name,count(a.id) total')
-            ->leftJoin('consult_order b', 'b.zxNo=a.zxNo')
-            ->leftJoin('depart_user c', 'c.uid=b.saleid AND c.is_del=0')
-            ->leftJoin('company_item cii', 'cii.id=c.itemid')
-            ->where($where)
-            ->group('addtime,cii.id')
-            ->order('addtime')
-            ->count();
+//        $count = Db::name('consult_info')
+//            ->alias('a')
+//            ->field('DATE_FORMAT(a.addtime,"%Y-%m-%d") addtime,cii.name,count(a.id) total')
+//            ->leftJoin('consult_order b', 'b.zxNo=a.zxNo')
+//            ->leftJoin('depart_user c', 'c.uid=b.saleid AND c.is_del=0')
+//            ->leftJoin('company_item cii', 'cii.id=c.itemid')
+//            ->where($where)
+//            ->group('addtime,cii.id')
+//            ->order('addtime')
+//            ->count();
 
         $list = Db::name('consult_info')
             ->alias('a')
-            ->field('DATE_FORMAT(a.addtime,"%Y-%m-%d") addtime,cii.name,count(a.id) total')
+            ->field('DATE_FORMAT(a.addtime,"%Y-%m-%d") addtime,b.saleid,count(a.id) total')
             ->leftJoin('consult_order b', 'b.zxNo=a.zxNo')
-            ->leftJoin('depart_user c', 'c.uid=b.saleid AND c.is_del=0')
-            ->leftJoin('company_item cii', 'cii.id=c.itemid')
+//            ->leftJoin('depart_user c', 'c.uid=b.saleid AND c.is_del=0')
+//            ->leftJoin('company_item cii', 'cii.id=c.itemid')
             ->where($where)
-            ->group('addtime,cii.id')
+            ->group('addtime,b.saleid')
             ->order('addtime', 'desc')
-            ->page($param['page'], $param['size'])
+//            ->page($param['page'], $param['size'])
             ->select()
             ->toArray();
-
-        return json_show(0, '请求成功', ['list' => $list, 'count' => $count]);
+        $saleArr=array_unique(array_column($list,"saleid"));
+        $departArr =get_company_name_by_uid($saleArr);
+        $data=[];
+	    foreach ($list as $value) {
+		    $depart=$departArr[$value['saleid']] ?? '0';
+		    if (!isset($data[$value['addtime'] . '-' . $depart])) $data[$value['addtime'] . '-' . $depart]=['addtime'=>$value['addtime'] , 'name'=>$depart , 'total'=>0];
+		    $data[$value['addtime'] . '-' . $depart]['total']+=$value['total'];
+	    }
+	
+	    return json_show(0 , '请求成功' , array_values($data));
 
     }