|
@@ -7,7 +7,6 @@ use Illuminate\Contracts\Queue\ShouldQueue;
|
|
|
use Illuminate\Foundation\Bus\Dispatchable;
|
|
use Illuminate\Foundation\Bus\Dispatchable;
|
|
|
use Illuminate\Queue\InteractsWithQueue;
|
|
use Illuminate\Queue\InteractsWithQueue;
|
|
|
use Illuminate\Queue\SerializesModels;
|
|
use Illuminate\Queue\SerializesModels;
|
|
|
-use App\Http\Requests\Manager\Process\LowPriceGoods as Request;
|
|
|
|
|
use App\Models\Manager\Process\LowPriceGoods as LowPriceGoodsModel;
|
|
use App\Models\Manager\Process\LowPriceGoods as LowPriceGoodsModel;
|
|
|
use App\Models\Manager\Personnel\Employee as EmployeeModel;
|
|
use App\Models\Manager\Personnel\Employee as EmployeeModel;
|
|
|
use PhpOffice\PhpSpreadsheet\Spreadsheet;
|
|
use PhpOffice\PhpSpreadsheet\Spreadsheet;
|
|
@@ -18,6 +17,7 @@ use App\Servers\Aliyun\Oss;
|
|
|
use App\Facades\Servers\Logs\Log;
|
|
use App\Facades\Servers\Logs\Log;
|
|
|
use App\Models\Manager\Other\DownloadTask as DownloadTaskModel;
|
|
use App\Models\Manager\Other\DownloadTask as DownloadTaskModel;
|
|
|
use Illuminate\Support\Facades\Cache;
|
|
use Illuminate\Support\Facades\Cache;
|
|
|
|
|
+use App\Models\Manager\External\Company as CompanyModel;
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -84,6 +84,7 @@ class ExportLowPriceGoodsJobs implements ShouldQueue
|
|
|
$LowPriceGoodsModel = new LowPriceGoodsModel();
|
|
$LowPriceGoodsModel = new LowPriceGoodsModel();
|
|
|
$LowPriceGoodsMemberModel = new LowPriceGoodsMemberModel();
|
|
$LowPriceGoodsMemberModel = new LowPriceGoodsMemberModel();
|
|
|
$EmployeeModel = new EmployeeModel();
|
|
$EmployeeModel = new EmployeeModel();
|
|
|
|
|
+ $CompanyModel = new CompanyModel();
|
|
|
$admin_company_id = $message_data['admin_company_id'];
|
|
$admin_company_id = $message_data['admin_company_id'];
|
|
|
$company_id = $message_data['company_id'];
|
|
$company_id = $message_data['company_id'];
|
|
|
$is_admin = $message_data['is_admin']; //是否管理员操作 0=是1=否
|
|
$is_admin = $message_data['is_admin']; //是否管理员操作 0=是1=否
|
|
@@ -254,13 +255,12 @@ class ExportLowPriceGoodsJobs implements ShouldQueue
|
|
|
->orWhere('source_responsible_person', 'like', "%,$user_id,%");
|
|
->orWhere('source_responsible_person', 'like', "%,$user_id,%");
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+ $snapshot_status = $CompanyModel->where(['id'=> $low_price_goods_where['company_id']])->value('snapshot_status');
|
|
|
$query->chunkById($limit, function ($rows) use ($key_name) {
|
|
$query->chunkById($limit, function ($rows) use ($key_name) {
|
|
|
$result_data = $rows->toArray();
|
|
$result_data = $rows->toArray();
|
|
|
if (empty($result_data)) {
|
|
if (empty($result_data)) {
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
$list_data = $this->processing_responsible_person($result_data);
|
|
$list_data = $this->processing_responsible_person($result_data);
|
|
|
$list_data_info = Cache::get($key_name) ?: [];
|
|
$list_data_info = Cache::get($key_name) ?: [];
|
|
|
$list_new_data = !empty($list_data_info) ? array_merge($list_data_info, $list_data) : $list_data;
|
|
$list_new_data = !empty($list_data_info) ? array_merge($list_data_info, $list_data) : $list_data;
|
|
@@ -272,7 +272,7 @@ class ExportLowPriceGoodsJobs implements ShouldQueue
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
$export_data_info = Cache::get($key_name) ?: [];
|
|
$export_data_info = Cache::get($key_name) ?: [];
|
|
|
- $this->export_download($export_data_info, $low_price_goods_where['company_id'], $file_id);
|
|
|
|
|
|
|
+ $this->export_download($export_data_info, $low_price_goods_where['company_id'], $file_id,$snapshot_status);
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -311,7 +311,7 @@ class ExportLowPriceGoodsJobs implements ShouldQueue
|
|
|
* @version 1.0
|
|
* @version 1.0
|
|
|
* @date 2025-06-17
|
|
* @date 2025-06-17
|
|
|
*/
|
|
*/
|
|
|
- public function export_download($data, $company_id, $file_id)
|
|
|
|
|
|
|
+ public function export_download($data, $company_id, $file_id,$snapshot_status)
|
|
|
{
|
|
{
|
|
|
// 创建一个新的 Spreadsheet 对象
|
|
// 创建一个新的 Spreadsheet 对象
|
|
|
$spreadsheet = new Spreadsheet();
|
|
$spreadsheet = new Spreadsheet();
|
|
@@ -380,6 +380,8 @@ class ExportLowPriceGoodsJobs implements ShouldQueue
|
|
|
// 填充数据
|
|
// 填充数据
|
|
|
$row = 3; // 从第2行开始
|
|
$row = 3; // 从第2行开始
|
|
|
foreach ($data as $item) {
|
|
foreach ($data as $item) {
|
|
|
|
|
+ //关闭快照不展示数据
|
|
|
|
|
+ if(!empty($snapshot_status) && $snapshot_status == 1) $item['snapshot_url'] = '';
|
|
|
$first_responsible_person_name = !empty($item['first_responsible_person_name']) ? implode(',', $item['first_responsible_person_name']) : '';
|
|
$first_responsible_person_name = !empty($item['first_responsible_person_name']) ? implode(',', $item['first_responsible_person_name']) : '';
|
|
|
$responsible_person_name = !empty($item['responsible_person_name']) ? implode(',', $item['responsible_person_name']) : '';
|
|
$responsible_person_name = !empty($item['responsible_person_name']) ? implode(',', $item['responsible_person_name']) : '';
|
|
|
$source_responsible_person_name = !empty($item['source_responsible_person_name']) ? implode(',', $item['source_responsible_person_name']) : '';
|
|
$source_responsible_person_name = !empty($item['source_responsible_person_name']) ? implode(',', $item['source_responsible_person_name']) : '';
|