|
|
@@ -7,7 +7,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
|
|
|
use Illuminate\Foundation\Bus\Dispatchable;
|
|
|
use Illuminate\Queue\InteractsWithQueue;
|
|
|
use Illuminate\Queue\SerializesModels;
|
|
|
-use App\Models\Manager\Process\LowPriceGoods as ViolationProductModel;
|
|
|
+use App\Models\Manager\Process\ViolationProduct as ViolationProductModel;
|
|
|
use App\Models\Manager\Personnel\Employee as EmployeeModel;
|
|
|
use PhpOffice\PhpSpreadsheet\Spreadsheet;
|
|
|
use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
|
|
|
@@ -80,11 +80,10 @@ class ExportViolationProductJobs implements ShouldQueue
|
|
|
public function export_excel($message_data)
|
|
|
{
|
|
|
$ViolationProductModel = new ViolationProductModel();
|
|
|
- $ViolationProductModel = new ViolationProductModel();
|
|
|
- $admin_company_id = $message_data['admin_company_id'] ?? '0';
|
|
|
- $company_id = $message_data['access_token']['company_id'] ?? '0';
|
|
|
- $is_admin = $message_data['access_token']['is_admin'] ?? '0'; //是否管理员操作 0=是1=否
|
|
|
- $user_id = $message_data['access_token']['uid'] ?? 0;
|
|
|
+ $admin_company_id = $message_data['admin_company_id'];
|
|
|
+ $company_id = $message_data['company_id'];
|
|
|
+ $is_admin = $message_data['is_admin']; //是否管理员操作 0=是1=否
|
|
|
+ $user_id = $message_data['user_id'];
|
|
|
$file_id = $message_data['file_id'];
|
|
|
// 查询条件
|
|
|
$map = [];
|
|
|
@@ -218,12 +217,11 @@ class ExportViolationProductJobs implements ShouldQueue
|
|
|
$query = $ViolationProductModel->where($map);
|
|
|
if ($is_admin != 1 && $company_id != 0) {
|
|
|
$query = $query->where(function ($q) use ($user_id) {
|
|
|
- $q->where('first_responsible_person', 'like', "%,{$user_id},%")
|
|
|
- ->orWhere('responsible_person', 'like', "%,{$user_id},%")
|
|
|
- ->orWhere('source_responsible_person', 'like', "%,{$user_id},%");
|
|
|
+ $q->where('first_responsible_person', 'like', "%,$user_id,%")
|
|
|
+ ->orWhere('responsible_person', 'like', "%,$user_id,%")
|
|
|
+ ->orWhere('source_responsible_person', 'like', "%,$user_id,%");
|
|
|
});
|
|
|
}
|
|
|
-
|
|
|
$query->orderByDesc('id')
|
|
|
->chunkById($limit, function ($rows) use ($key_name) {
|
|
|
$result_data = $rows->toArray();
|