胡庆余堂

app/Model/Employee.php

@@ -30,6 +30,8 @@ class Employee extends Model
         1 => '是'
     ];
 
+    public static $field = ['*'];
+
     const AUTH_ONE = 1; // 我的
     const AUTH_TWO = 2; // 部门
     const AUTH_THREE = 3; // 全部

app/Service/DeviceService.php

@@ -171,7 +171,7 @@ class DeviceService extends Service
     public function deviceList($data,$user){
         $model = $this->deviceCommon($data, $user);
         $list = $this->limit($model,'',$data);
-        $list = $this->fillData($list,$user,$data);
+        $list = $this->fillData($list);
 
         return [true, $list];
     }
@@ -211,7 +211,7 @@ class DeviceService extends Service
         return [true, $data];
     }
 
-    public function fillData($data, $user, $search){
+    public function fillData($data){
         if(empty($data['data'])) return $data;
 
         $emp = (new EmployeeService())->getEmployeeMap(array_unique(array_column($data['data'],'crt_id')));

app/Service/EmployeeService.php

@@ -7,7 +7,6 @@ use App\Model\Depart;
 use App\Model\Employee;
 use App\Model\EmployeeDepartPermission;
 use App\Model\EmployeeDetails;
-use App\Model\EmployeeIndex;
 use App\Model\EmployeeManagerDepart;
 use App\Model\EmployeeMenuPermission;
 use App\Model\EmployeeRole;
@@ -279,18 +278,14 @@ class EmployeeService extends Service
         return [true, $user];
     }
 
-    /**
-     * 用户列表
-     * @param $data
-     * @param $user
-     * @return array
-     */
-    public function employeeList($data, $user){
+    public function employeeCommon($data,$user, $field = []){
+        if(empty($field)) $field = Employee::$field;
+
         $model = Employee::where('del_time',0)
-            ->select('*')
-            ->orderBy('id','desc');
+            ->select($field)
+            ->orderby('id', 'desc');
 
-        if(! empty($data['id'])) $model->where('id', $data['id']);
+        if(! empty($data['id'])) $model->whereIn('id', $data['id']);
         if(! empty($data['number'])) $model->where('number', 'LIKE', '%'.$data['number'].'%');
         if(! empty($data['emp_name'])) $model->where('emp_name', 'LIKE', '%'.$data['emp_name'].'%');
         if(! empty($data['mobile'])) $model->where('mobile', 'LIKE', '%'.$data['mobile'].'%');
@@ -305,12 +300,22 @@ class EmployeeService extends Service
                 ->select('employee_id')->get()->toArray();
             $model->whereIn('id',array_column($emp,'employee_id'));
         }
-        $list = $this->limit($model,'',$data);
 
-        //组织数据
+        return $model;
+    }
+
+    /**
+     * 产品列表
+     * @param $data
+     * @param $user
+     * @return array
+     */
+    public function employeeList($data,$user){
+        $model = $this->employeeCommon($data, $user);
+        $list = $this->limit($model,'',$data);
         $list = $this->organizationEmployeeData($list);
 
-        return [true , $list];
+        return [true, $list];
     }
 
     /**

app/Service/ExportFileService.php

@@ -74,8 +74,8 @@ class ExportFileService extends Service
     }
 
     public function one($ergs, $user){
-        $service = new ProductService();
-        $model = $service->productCommon($ergs, $user);
+        $service = new EmployeeService();
+        $model = $service->employeeCommon($ergs, $user);
 
         // 导出数据
         $return = [];
@@ -83,9 +83,12 @@ class ExportFileService extends Service
         $header_default = $user['e_header_default'];
         $column = array_column($header_default,'key');
         $header = array_column($header_default,'value');
-        $model->chunk(500,function ($data) use(&$return,$column){
+        $model->chunk(500,function ($data) use(&$return,$column,$service){
             $data = $data->toArray();
-            $this->fillData($data, $column, $return);
+            $list['data'] = $data;
+            $list = $service->organizationEmployeeData($list);
+
+            $this->fillData($list['data'], $column, $return);
         });
 
         return [true, $this->saveExportData($return,$header)];
@@ -100,10 +103,14 @@ class ExportFileService extends Service
         $header = array_column($header_default,'value');
 
         $service = new ItemService();
-        $model = $service->freightCommon($ergs, $user);
-        $model->chunk(500,function ($data) use(&$return,$column){
+        $model = $service->itemCommon($ergs, $user);
+        $model->chunk(500,function ($data) use(&$return,$column,$service){
             $data = $data->toArray();
-            $this->fillData($data, $column, $return);
+
+            $list['data'] = $data;
+            $list = $service->fillData($list);
+
+            $this->fillData($list['data'], $column, $return);
         });
 
         return [true, $this->saveExportData($return,$header)];
@@ -116,24 +123,19 @@ class ExportFileService extends Service
         $column = array_column($header_default,'key');
         $header = array_column($header_default,'value');
 
-        $service = new StatisticsService();
-        list($status, $model) = $service->statisticsRevenueCostCommon($ergs, $user);
+        $service = new DeviceService();
+        list($status, $model) = $service->deviceCommon($ergs, $user);
         if(! $status) return [false, $model];
         $model->chunk(500,function ($data) use(&$return, $service, $column){
             $data = $data->toArray();
             $list['data'] = $data;
 
             //订单数据
-            $list = $service->statisticsRevenueCostFillData($list);
+            $list = $service->fillData($list);
             //返回数据
             $this->fillData($list['data'], $column, $return);
         });
 
-        //合计
-        $total = $this->countTotal($return, $header_default);
-        //填充合计
-        $this->fillTotalData($total, $header_default, $return);
-
         return [true, $this->saveExportData($return,$header)];
     }
 
@@ -144,9 +146,8 @@ class ExportFileService extends Service
         $column = array_column($header_default,'key');
         $header = array_column($header_default,'value');
 
-        $ergs['order_type'] = RevenueCost::ORDER_ONE;
-        $service = new StatisticsService();
-        list($status, $model) = $service->statisticsRevenueCostOneAndTwoCommon($ergs, $user);
+        $service = new RDService();
+        list($status, $model) = $service->rdCommon($ergs, $user);
         if(! $status) return [false, $model];
 
         $model->chunk(500,function ($data) use(&$return, $column, $service){
@@ -154,7 +155,7 @@ class ExportFileService extends Service
             $list['data'] = $data;
 
             //订单数据
-            $list = $service->statisticsRevenueCostOneAndTwoFillData($list);
+            $list = $service->fillData($list);
 
             $this->fillData($list['data'], $column, $return);
         });
@@ -226,140 +227,6 @@ class ExportFileService extends Service
         return [true , $this->saveExportData($return,$header)];
     }
 
-    public function seven($ergs,$user){
-        // 导出数据
-        $return = [];
-        $header_default = $user['e_header_default'];
-        $column = array_column($header_default,'key');
-        $header = array_column($header_default,'value');
-        $service = new GiveOutService();
-        $model = $service->giveOutCommon($ergs, $user);
-        $model->chunk(500,function ($data) use(&$return, $column, $service){
-            $data = $data->toArray();
-            $list['data'] = $data;
-
-            //订单数据
-            $list = $service->fillData($list);
-
-            $this->fillData($list['data'], $column, $return);
-        });
-
-        //合计
-        $total = $this->countTotal($return, $header_default);
-        //填充合计
-        $this->fillTotalData($total, $header_default, $return);
-
-        return [true, $this->saveExportData($return,$header)];
-    }
-
-    public function eight($ergs,$user){
-        //导出
-        $return = [];
-        $header_default = $user['e_header_default'];
-        $column = array_column($header_default, 'key');
-        $header = array_column($header_default, 'value');
-
-        $service = new StatisticsService();
-        list($status,$model) = $service->statisticsProfitCommon($ergs, $user);
-        if(! $status) return [false, $model];
-
-        $model->chunk(500, function ($data) use (&$return, $column, $service) {
-            $data = $data->toArray();
-            $list['data'] = $data;
-
-            //订单数据
-            $list = $service->statisticsProfitFillData($list);
-
-            $this->fillData($list['data'], $column, $return);
-        });
-
-        //合计
-        $total = $this->countTotal($return, $header_default);
-        //填充合计
-        $this->fillTotalData($total, $header_default, $return);
-
-        return [true, $this->saveExportData($return,$header)];
-    }
-
-    public function nine($ergs,$user){
-        $return = [];
-        $header_default = $user['e_header_default'];
-        $column = array_column($header_default, 'key');
-        $header = array_column($header_default, 'value');
-
-        $service = new StatisticsService();
-        list($status,$model) = $service->statisticsEmployeeSalaryCommon($ergs, $user);
-        if(! $status) return [false, $model];
-
-        $model->chunk(500, function ($data) use (&$return, $column, $service) {
-            $data = $data->toArray();
-            $list['data'] = $data;
-
-            //订单数据
-            $list = $service->statisticsEmployeeSalaryFillData($list);
-
-            $this->fillData($list['data'], $column, $return);
-        });
-
-        //合计
-        $total = $this->countTotal($return, $header_default);
-        //填充合计
-        $this->fillTotalData($total, $header_default, $return);
-
-        return [true, $this->saveExportData($return,$header)];
-    }
-
-    public function ten11($ergs,$user){
-        $return = [];
-        $header_default = $user['e_header_default'];
-        $column = array_column($header_default, 'key');
-        $header = array_column($header_default, 'value');
-
-        $service = new StatisticsService();
-        list($status,$model) = $service->statisticsFreightFeeCommon($ergs, $user);
-        if(! $status) return [false, $model];
-
-        $model->chunk(500, function ($data) use (&$return, $column, $service,$user, $ergs) {
-            $data = $data->toArray();
-            $list['data'] = $data;
-
-            //订单数据
-            $list = $service->statisticsFreightFeeFillData($list, $user,$ergs);
-
-            $this->fillData($list['data'], $column, $return);
-        });
-
-        //合计
-        $total = $this->countTotal($return, $header_default);
-        //填充合计
-        $this->fillTotalData($total, $header_default, $return);
-
-        return [true, $this->saveExportData($return,$header)];
-    }
-
-    public function ten($ergs,$user){
-        $return = [];
-        $header_default = $user['e_header_default'];
-        $column = array_column($header_default, 'key');
-        $header = array_column($header_default, 'value');
-
-        $service = new StatisticsService();
-        list($status,$model) = $service->statisticsFreightFeeCommon($ergs, $user);
-        if(! $status) return [false, $model];
-
-        $model->chunk(10, function ($data) use (&$return, $column, $service,$user, $ergs) {
-            $data = $data->toArray();
-
-            $order_time = array_column($data,'order_time');
-            $ergs = array_merge($ergs, ['order_time' => $order_time]);
-
-            $list = $service->statisticsFreightFeeDetailsForExport($ergs, $user);
-            $return = array_merge_recursive($return, $list);
-        });
-
-        return [true, $this->saveExportData2($return)];
-    }
-
     public function saveExportData($data, $headers, $type = 'default',$file_name = ''){
         if(empty($file_name)) $file_name = self::$filename . "_". date("Y-m-d") . "_". rand(1000,9999);
         $filename =  $file_name . '.' . 'xlsx';

app/Service/ItemService.php

@@ -229,7 +229,7 @@ class ItemService extends Service
     public function itemList($data,$user){
         $model = $this->itemCommon($data, $user);
         $list = $this->limit($model,'',$data);
-        $list = $this->fillData($list,$user,$data);
+        $list = $this->fillData($list);
 
         return [true, $list];
     }
@@ -275,7 +275,7 @@ class ItemService extends Service
         return [true, $data];
     }
 
-    public function fillData($data, $user, $search){
+    public function fillData($data){
         if(empty($data['data'])) return $data;
 
         $emp = (new EmployeeService())->getEmployeeMap(array_unique(array_column($data['data'],'crt_id')));

config/header/64.php

@@ -25,10 +25,12 @@ return [
     [
         'key' =>'enter_time',
         'value' => '入职时间',
+        'default' => '',
     ],
     [
         'key' =>'leave_time',
         'value' => '离职时间',
+        'default' => '',
     ],
     [
         'key' =>'is_use_title',

routes/api.php

@@ -110,11 +110,11 @@ Route::group(['middleware'=> ['checkLogin']],function ($route){
     $route->any('deviceDetail', 'Api\DeviceController@deviceDetail');
 
     //研发工时
-    $route->any('rdList', 'Api\DeviceController@rdList');
-    $route->any('rdEdit', 'Api\DeviceController@rdEdit');
-    $route->any('rdAdd', 'Api\DeviceController@rdAdd');
-    $route->any('rdDel', 'Api\DeviceController@rdDel');
-    $route->any('rdDetail', 'Api\DeviceController@rdDetail');
+    $route->any('rdList', 'Api\RDController@rdList');
+    $route->any('rdEdit', 'Api\RDController@rdEdit');
+    $route->any('rdAdd', 'Api\RDController@rdAdd');
+    $route->any('rdDel', 'Api\RDController@rdDel');
+    $route->any('rdDetail', 'Api\RDController@rdDetail');
 
     //获取默认表头
     $route->any('getTableHead','Api\TableHeadController@tableHeadGet');

routes/wx.php

@@ -73,9 +73,9 @@ Route::group(['middleware'=> ['checkWx']],function ($route){
     $route->any('deviceDetail', 'Api\DeviceController@deviceDetail');
 
     //研发工时
-    $route->any('rdList', 'Api\DeviceController@rdList');
-    $route->any('rdEdit', 'Api\DeviceController@rdEdit');
-    $route->any('rdAdd', 'Api\DeviceController@rdAdd');
-    $route->any('rdDel', 'Api\DeviceController@rdDel');
-    $route->any('rdDetail', 'Api\DeviceController@rdDetail');
+    $route->any('rdList', 'Api\RDController@rdList');
+    $route->any('rdEdit', 'Api\RDController@rdEdit');
+    $route->any('rdAdd', 'Api\RDController@rdAdd');
+    $route->any('rdDel', 'Api\RDController@rdDel');
+    $route->any('rdDetail', 'Api\RDController@rdDetail');
 });