From 462c5fc22fc837ed59cc0b3194ea07c1fc12b38a Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Mon, 30 Nov 2020 14:26:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=80=81=E7=BB=9F=E8=AE=A1=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=AF=E5=A4=9A=E4=B8=AA=E6=87=92ID?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/v3/OrderDeliveryReportController.php | 2 +- app/Admin/Repositories/v3/OrderDeliveryReport.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Admin/Controllers/v3/OrderDeliveryReportController.php b/app/Admin/Controllers/v3/OrderDeliveryReportController.php index 88e6dc8..7f1b963 100644 --- a/app/Admin/Controllers/v3/OrderDeliveryReportController.php +++ b/app/Admin/Controllers/v3/OrderDeliveryReportController.php @@ -83,7 +83,7 @@ class OrderDeliveryReportController extends AdminController $filter->equal('start_time','开始时间')->date()->width(2); $filter->equal('end_time','结束时间')->date()->width(2); // $filter->equal('horseman_id','配送员ID')->width(2); - $filter->equal('user_id','懒ID')->width(2); + $filter->equal('user_id','懒ID')->placeholder('多个懒ID使用英文逗号隔开')->width(2); $filter->equal('name','姓名')->width(2); if(!$marketId){ $filter->equal('market_id','市场')->select($marketList)->width(2); diff --git a/app/Admin/Repositories/v3/OrderDeliveryReport.php b/app/Admin/Repositories/v3/OrderDeliveryReport.php index 5e47035..a1392c2 100644 --- a/app/Admin/Repositories/v3/OrderDeliveryReport.php +++ b/app/Admin/Repositories/v3/OrderDeliveryReport.php @@ -83,7 +83,8 @@ class OrderDeliveryReport extends EloquentRepository ->where(Model::$tableName.'.created_at','>=',strtotime('2020-10-01 00:00:00')); if($userId){ - $model->where(EmployeesModel::TABLE_NAME.'.user_id',$userId); + $userId = explode(',',$userId); + $model->whereIn(EmployeesModel::TABLE_NAME.'.user_id',$userId); } if($name){ $model->where(EmployeesModel::TABLE_NAME.'.name','like',"%$name%");