数据看板，未竞价单优化

app/admin/controller/Data.php

@@ -227,12 +227,14 @@ class Data extends BaseController
             ->where('is_del', 0)
             ->count('id');
 
-
         //已反馈单数
         $zixun_bids = Db::name('consult_bids')
-            ->where('is_del', 0)
-            ->group('infoNo')
-            ->count('id');
+            ->alias('cb')
+            ->where('cb.is_del', 0)
+            ->join('consult_order co', 'co.zxNo = cb.zxNo ')
+            ->where('co.endtime', '>=', date('Y-m-d H:i:s'))
+            ->group('cb.infoNo')
+            ->count('cb.id');
 
         //未竞价单数(未反馈单数)
         $not_feedback = $zixun_total - $zixun_bids;

app/admin/controller/Report.php

@@ -384,8 +384,8 @@ class Report extends Base
         $param = $this->request->only([
             'token',
             'zxNo' => [],
-            'start_date' => date('Y-m-d'),
-            'end_date' => date('Y-m-d'),
+            'start_date' =>'',
+            'end_date' => '',
             'page' => 1,
             'size' => 15,
             'is_export' => 0,//是否导出，1导出，0不导出
@@ -403,7 +403,7 @@ class Report extends Base
             ->alias('cb')
             ->where('cb.is_del', 0);
 
-        if (!empty($param['start_date']) && !empty($param['end_date'])) $rs->whereBetween('cb.addtime', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']);
+        if ($param['start_date']!='' && $param['end_date']!='') $rs->whereBetween('cb.addtime', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']);
         if (!empty($param['zxNo'])) $rs->whereIn('cb.zxNo', $param['zxNo']);
 
         if ($param['is_export'] == 1) {
@@ -448,8 +448,8 @@ class Report extends Base
         $param = $this->request->only([
             'token',
             'companyName' => '',
-            'start_date' => date('Y-m-d'),
-            'end_date' => date('Y-m-d'),
+            'start_date' => '',
+            'end_date' => '',
             'page' => 1,
             'size' => 15,
             'is_export' => 0,//是否导出，1导出，0不导出