Commit 5efb400c by 杨昕

test

parent 3d2aee89
Pipeline #18770 passed with stages
in 2 minutes 9 seconds
...@@ -1153,7 +1153,7 @@ class MediaModel extends Eloquent ...@@ -1153,7 +1153,7 @@ class MediaModel extends Eloquent
$match = [ $match = [
'status' => "1", 'status' => "1",
"screen_shot" => ["\$ne" => 'null'] "screen_shot" => null
]; ];
if (isset($request->media_id) && !empty($request->media_id)) { if (isset($request->media_id) && !empty($request->media_id)) {
...@@ -1185,6 +1185,18 @@ class MediaModel extends Eloquent ...@@ -1185,6 +1185,18 @@ class MediaModel extends Eloquent
*/ */
foreach ($tmp_arr as $media) { foreach ($tmp_arr as $media) {
$tz = new \DateTimeZone("Asia/Shanghai"); $tz = new \DateTimeZone("Asia/Shanghai");
if (is_object($media['start_time'])) {
$start_time = $media['start_time']->toDateTime();
$start_time->setTimezone($tz);
$start_time = $start_time->format("Y-m-d H:i:s");
$media['start_time'] = $start_time;
}
if (is_object($media['end_time'])) {
$end_time = $media['end_time']->toDateTime();
$end_time->setTimezone($tz);
$media['end_time'] = $end_time->format('Y-m-d H:i:s');
}
if (is_object($media['create_time'])) { if (is_object($media['create_time'])) {
$create_time = $media['create_time']->toDateTime(); $create_time = $media['create_time']->toDateTime();
$create_time->setTimezone($tz); $create_time->setTimezone($tz);
......
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