Commit 9bca32d3 by 杨昕

按照指定顺序导出表格

parent ee0235af
Pipeline #14117 passed with stages
in 2 minutes 59 seconds
...@@ -340,7 +340,7 @@ class MediaController extends Controller ...@@ -340,7 +340,7 @@ class MediaController extends Controller
$content = json_decode($record['content'],true); $content = json_decode($record['content'],true);
DownloadRecord::delRecord($keyId); // DownloadRecord::delRecord($keyId);
return new MediasExport($content); return new MediasExport($content);
......
...@@ -1047,12 +1047,11 @@ class MediaModel extends Eloquent ...@@ -1047,12 +1047,11 @@ class MediaModel extends Eloquent
private static function mediaExportFormat(array $data,$orginal_data){ private static function mediaExportFormat(array $data,$orginal_data){
foreach ($orginal_data as $key => &$item){
foreach ($data as $key => &$item){
if (empty($data[$key])){
if (empty($item)){ $item['id'] = $key;
$item['_id'] = $key;
$item['media_name'] = '未查到相关数据'; $item['media_name'] = '未查到相关数据';
$item['forvery_url'] = '未查到相关数据'; $item['forvery_url'] = '未查到相关数据';
$item['is_full_url'] = "未查到相关数据"; $item['is_full_url'] = "未查到相关数据";
...@@ -1060,34 +1059,27 @@ class MediaModel extends Eloquent ...@@ -1060,34 +1059,27 @@ class MediaModel extends Eloquent
}else{ }else{
$media = MediaModel::select('media_name')->where('_id',$item['id'])->first(); $media_id = $item['media_id'];
$media = MediaModel::select('media_name')->where('_id',$media_id)->first();
$media_id = $item['id'];
$media_num = md5(md5($media_id)); $media_num = md5(md5($media_id));
$item['_id'] = $item['id'];
$item['media_name'] = $media['media_name']; $item['media_name'] = $media['media_name'];
$item['name'] = $orginal_data[$item['_id']]['name'];
$tmp = [ $tmp = [
'media_num' => $media_num, 'media_num' => $media_num,
]; ];
MediaModel::where("_id",$media_id)->update($tmp); MediaModel::where("_id",$media_id)->update($tmp);
$url = getenv('preview_domain')?getenv('preview_domain'):"https://xue.t.eoffcn.com/preview/temp/"; $url = getenv('preview_domain')?getenv('preview_domain'):"https://xue.t.eoffcn.com/preview/temp/";
$item['forvery_url'] = $item['url']; $item['forvery_url'] = $data[$key]['url'];
$item['is_full_url'] = $url."player".'/'.$media_num; $item['is_full_url'] = $url."player".'/'.$media_num;
$item['name'] = $orginal_data[$media_id]['name'];
unset($item['id']);
unset($item['key']);
unset($item['status']);
unset($item['url']);
} }
} }
return $data; return $orginal_data;
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment