|
|
@ -590,7 +590,10 @@ class Task extends BaseController |
|
|
|
private function downloadName(JobsT $job_info){ |
|
|
|
private function downloadName(JobsT $job_info){ |
|
|
|
$job_params = json_decode($job_info->payload,true)['data']['params']; |
|
|
|
$job_params = json_decode($job_info->payload,true)['data']['params']; |
|
|
|
list(,$ext) = explode('.', $job_info->remark); |
|
|
|
list(,$ext) = explode('.', $job_info->remark); |
|
|
|
$downloadName = $job_params['export_date1'] . '-' . $job_params['export_date2']; |
|
|
|
if (empty($job_params['export_date1'])) |
|
|
|
|
|
|
|
$downloadName = date('Y-m-d'); |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
$downloadName = $job_params['export_date1'] . '-' . $job_params['export_date2']; |
|
|
|
if($job_info->queue != 'default'){ |
|
|
|
if($job_info->queue != 'default'){ |
|
|
|
$downloadName = $job_info->queue; |
|
|
|
$downloadName = $job_info->queue; |
|
|
|
}else if($job_params['export_type'] == 'repeat' && $job_params['export_table'] == 'repeat_frame_t'){ |
|
|
|
}else if($job_params['export_type'] == 'repeat' && $job_params['export_table'] == 'repeat_frame_t'){ |
|
|
|