Browse Source

配送统计,增加可多个懒ID查询

master
liangyuyan 5 years ago
parent
commit
462c5fc22f
  1. 2
      app/Admin/Controllers/v3/OrderDeliveryReportController.php
  2. 3
      app/Admin/Repositories/v3/OrderDeliveryReport.php

2
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);

3
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%");

Loading…
Cancel
Save