...
|
...
|
@@ -361,9 +361,55 @@ class Index extends Api |
|
|
$shangwu2[$k]['fvip'] = null;
|
|
|
}
|
|
|
}
|
|
|
//上午时间飞机三
|
|
|
$shangwu3 = Db::name('sun')
|
|
|
->alias('s')
|
|
|
->join('time t', 't.id=s.type_id')
|
|
|
->where($map)
|
|
|
->where(['s.cloud_type' => 1])
|
|
|
->where(['s.plane_type' => 3])
|
|
|
->join('planename p', 'p.id=s.plane_type')
|
|
|
->field('s.id as fid,p.name as fname,s.plane_type as fplane_type,s.status as fstatus,s.user_id as fuser_id')
|
|
|
->select();
|
|
|
foreach ($shangwu3 as $k => $v) {
|
|
|
if ($v['fuser_id'] != null) {
|
|
|
$user = Db::name('user')->where(['id' => $v['fuser_id']])->find();
|
|
|
$shangwu3[$k]['fnickname'] = $user['nickname'];
|
|
|
$shangwu3[$k]['fvip'] = $user['vip'];
|
|
|
} else {
|
|
|
$shangwu3[$k]['fnickname'] = null;
|
|
|
$shangwu3[$k]['fvip'] = null;
|
|
|
}
|
|
|
}
|
|
|
//上午时间飞机四
|
|
|
$shangwu4 = Db::name('sun')
|
|
|
->alias('s')
|
|
|
->join('time t', 't.id=s.type_id')
|
|
|
->where($map)
|
|
|
->where(['s.cloud_type' => 1])
|
|
|
->where(['s.plane_type' => 4])
|
|
|
->join('planename p', 'p.id=s.plane_type')
|
|
|
->field('s.id as fid,p.name as fname,s.plane_type as fplane_type,s.status as fstatus,s.user_id as fuser_id')
|
|
|
->select();
|
|
|
foreach ($shangwu4 as $k => $v) {
|
|
|
if ($v['fuser_id'] != null) {
|
|
|
$user = Db::name('user')->where(['id' => $v['fuser_id']])->find();
|
|
|
$shangwu4[$k]['fnickname'] = $user['nickname'];
|
|
|
$shangwu4[$k]['fvip'] = $user['vip'];
|
|
|
} else {
|
|
|
$shangwu4[$k]['fnickname'] = null;
|
|
|
$shangwu4[$k]['fvip'] = null;
|
|
|
}
|
|
|
}
|
|
|
foreach ($shangwu1 as $key => $vo) {
|
|
|
$up[] = array_merge($vo, $shangwu2[$key]);
|
|
|
}
|
|
|
foreach ($shangwu2 as $key => $vo) {
|
|
|
$up[] = array_merge($vo, $shangwu3[$key]);
|
|
|
}
|
|
|
foreach ($shangwu4 as $key => $vo) {
|
|
|
$up[] = array_merge($vo, $shangwu4[$key]);
|
|
|
}
|
|
|
//$up 上午
|
|
|
//$down 下午
|
|
|
//下午时间飞机一
|
...
|
...
|
@@ -406,9 +452,55 @@ class Index extends Api |
|
|
$xiawu2[$k]['fvip'] = null;
|
|
|
}
|
|
|
}
|
|
|
//下午时间飞机三
|
|
|
$xiawu3 = Db::name('sun')
|
|
|
->alias('s')
|
|
|
->join('time t', 't.id=s.type_id')
|
|
|
->where($map)
|
|
|
->where(['s.cloud_type' => 2])
|
|
|
->where(['s.plane_type' => 3])
|
|
|
->join('planename p', 'p.id=s.plane_type')
|
|
|
->field('s.id as fid,p.name as fname,s.plane_type as fplane_type,s.status as fstatus,s.user_id as fuser_id')
|
|
|
->select();
|
|
|
foreach ($xiawu3 as $k => $v) {
|
|
|
if ($v['fuser_id'] != null) {
|
|
|
$user = Db::name('user')->where(['id' => $v['fuser_id']])->find();
|
|
|
$xiawu3[$k]['fnickname'] = $user['nickname'];
|
|
|
$xiawu3[$k]['fvip'] = $user['vip'];
|
|
|
} else {
|
|
|
$xiawu3[$k]['fnickname'] = null;
|
|
|
$xiawu3[$k]['fvip'] = null;
|
|
|
}
|
|
|
}
|
|
|
//下午时间飞机四
|
|
|
$xiawu4 = Db::name('sun')
|
|
|
->alias('s')
|
|
|
->join('time t', 't.id=s.type_id')
|
|
|
->where($map)
|
|
|
->where(['s.cloud_type' => 2])
|
|
|
->where(['s.plane_type' => 4])
|
|
|
->join('planename p', 'p.id=s.plane_type')
|
|
|
->field('s.id as fid,p.name as fname,s.plane_type as fplane_type,s.status as fstatus,s.user_id as fuser_id')
|
|
|
->select();
|
|
|
foreach ($xiawu4 as $k => $v) {
|
|
|
if ($v['fuser_id'] != null) {
|
|
|
$user = Db::name('user')->where(['id' => $v['fuser_id']])->find();
|
|
|
$xiawu4[$k]['fnickname'] = $user['nickname'];
|
|
|
$xiawu4[$k]['fvip'] = $user['vip'];
|
|
|
} else {
|
|
|
$xiawu4[$k]['fnickname'] = null;
|
|
|
$xiawu4[$k]['fvip'] = null;
|
|
|
}
|
|
|
}
|
|
|
foreach ($xiawu1 as $key => $vo) {
|
|
|
$down[] = array_merge($vo, $xiawu2[$key]);
|
|
|
}
|
|
|
foreach ($xiawu2 as $key => $vo) {
|
|
|
$down[] = array_merge($vo, $xiawu3[$key]);
|
|
|
}
|
|
|
foreach ($xiawu3 as $key => $vo) {
|
|
|
$down[] = array_merge($vo, $xiawu4[$key]);
|
|
|
}
|
|
|
$list = [
|
|
|
'up' => $up,
|
|
|
'down' => $down
|
...
|
...
|
|