优化拓展员数据导出

app/Admin/Actions/EXporter/SalesMan.php

@@ -3,17 +3,12 @@
 namespace App\Admin\Actions\Exporter;
 
 use App\Models\LanzuCsInfo;
-use App\Models\LanzuMarket;
-use Dcat\Admin\Grid\Exporters\AbstractExporter;
-use Illuminate\Database\Eloquent\Collection;
+
 use Illuminate\Support\Facades\DB;
 use Maatwebsite\Excel\Concerns\FromArray;
-use Maatwebsite\Excel\Concerns\FromCollection;
 use Maatwebsite\Excel\Concerns\WithStrictNullComparison;
-use Maatwebsite\Excel\Facades\Excel;
 use App\Admin\Common\Order;
 use App\Models\LanzuUserRelationBind;
-use Illuminate\Console\Command;
 use \App\Models\v3\CsInfo as modelCsInfo;
 
 class SalesMan implements FromArray, WithStrictNullComparison
@@ -42,7 +37,7 @@ class SalesMan implements FromArray, WithStrictNullComparison
         foreach ($res as $value){
             $item =[];
             $item[] = $value['person_id'];
-            $item[] = $value['nick_name'];
+            $item[] = $value['real_name']??$value['nick_name'];
             $item[] = $value['name'];
             $item[] = $value['address'];
             $item[] = $value['user_num']??0;
@@ -81,8 +76,15 @@ class SalesMan implements FromArray, WithStrictNullComparison
      */
     public function csDetail($adminUid, $option, $nickName, $result)
     {
-        $data = modelCsInfo::whereIn('admin_user_id', $adminUid)
+        $data = modelCsInfo::whereIn('lanzu_cs_info.admin_user_id', $adminUid)
+            ->select('lanzu_cs_info.*','lanzu_employees.name as real_name')
+            ->leftJoin('lanzu_employees', function ($join){
+                $join->on('lanzu_employees.user_id','=', 'lanzu_cs_info.person_id')
+                        ->where('lanzu_employees.status','=',1);
+
+            })
             ->get()->toArray();
+
         foreach ($data as &$value) {
             //>>1.获取绑定后下过单的用户
             $value['user_num'] = LanzuUserRelationBind::where('source_id', $value['admin_user_id'])->count();
@@ -112,7 +114,6 @@ class SalesMan implements FromArray, WithStrictNullComparison
             $value['nick_name'] = $nickName;
             $result[] = $value;
         }
-
         return $result;
     }
 }

app/Admin/Controllers/v3/Salesman.php

@@ -9,6 +9,7 @@ use App\Admin\Actions\Tools\SalesmanOption;
 use App\Admin\Actions\Tools\SalesmanOptionCopy;
 use App\Http\Controllers\TestController;
 use App\Models\LanzuMarket;
+use App\Models\v3\LanzuEmployees;
 use App\Models\v3\SalesmanData;
 use Dcat\Admin\Controllers\AdminController;
 use Dcat\Admin\Grid;
@@ -52,7 +53,13 @@ class Salesman extends AdminController
                 $grid->paginate(10);
                 $grid->tools($content);
                 $grid->column('person_id', '懒ID');
-                $grid->column('nick_name', '拓展员');
+                $grid->column('nick_name', '拓展员')->display(function (){
+                    $row = LanzuEmployees::where('user_id',$this->person_id)->where('status',1)->first();
+                    if ($row){
+                        return $row->name;
+                    }
+                    return $this->nick_name;
+                });
                 $grid->column('total', '社区总数');
                 $grid->column('user_id', '绑定用户数')->display(function ($uid) {
                     if ($uid) {
@@ -73,10 +80,13 @@ class Salesman extends AdminController
                 $grid->disableDeleteButton();
                 $grid->disableViewButton();
                 $grid->filter(function (Grid\Filter $filter)use ($option) {
-                    $filter->equal('person_id', '拓展员懒ID');
+                    $filter->equal('user_id','拓展员')->select(
+                        LanzuEmployees::where('status',1)->pluck('name','user_id')
+                    );
                     if ($option==0){
                         $filter->between('created_at','日期')->datetime();
                     }
+
                 });
             });
         }