作者 赵彬吉

update

... ... @@ -10,6 +10,7 @@ use App\Models\Inquiry\InquiryForm;
use App\Models\Inquiry\PhoneData;
use App\Rules\Ids;
use App\Services\BatchExportService;
use App\Utils\LogUtils;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Str;
... ... @@ -135,7 +136,7 @@ class InquiryController extends BaseController
{
if(!empty($this->param['form_id'])){
$data = $logic->getFormDataList(true);
$field = InquiryForm::getField($this->param['form_id']);
$field = InquiryForm::getField($this->param['form_id'], $this->user['project_id']);
$map = [
'submit_time' => '询盘发送时间',
];
... ... @@ -179,8 +180,12 @@ class InquiryController extends BaseController
if(!empty($this->param['form_id'])){
$item = array_merge($item, $item['data']);
}
LogUtils::info('Inquiry_export', [$map, $item]);
foreach ($map as $field => $name) {
if(empty($item[$field])){
$item[$field] = '';
continue;
}
if(is_array($item[$field])){
$item[$field] = implode(',',$item[$field]);
}
... ...
... ... @@ -89,7 +89,7 @@ class InquiryLogic extends BaseLogic
$page = $this->request['page'] ?: 1;
$form_id = $this->request['form_id'] ?? '';
$ids = $this->request['ids'] ?? [];
$field = InquiryForm::getField($form_id);
$field = InquiryForm::getField($form_id, $this->user['project_id']);
$fields = ['id', 'data', 'ip', 'country', 'domain', DB::raw('referer as refer'), DB::raw('status as read_status'), DB::raw('submit_at as submit_time')];
$lists = InquiryFormData::where('form_id', $form_id)
->where(function ($query) use ($search, $field,$ids){
... ...
... ... @@ -50,8 +50,8 @@ class InquiryForm extends Base
* @author zbj
* @date 2023/12/5
*/
public static function getField($form_id){
$cache_key = 'inquiry_form_field_' . $form_id;
public static function getField($form_id, $project_id){
$cache_key = 'inquiry_form_field_' . $project_id . '_' . $form_id;
$field = Cache::get($cache_key);
if(!$field){
$field = self::where('id', $form_id)->value('field');
... ...