|
|
@@ -31,14 +31,16 @@ class Decision extends Api
|
|
|
->order('month desc')
|
|
|
->select();
|
|
|
$sist = \db('设备_基本资料')
|
|
|
- ->field('rtrim(设备编组) as 设备编组')
|
|
|
->whereNotNull('设备编组')
|
|
|
->group('设备编组')
|
|
|
- ->select();
|
|
|
+ ->column('rtrim(设备编组) as 设备编组');
|
|
|
$data = [];
|
|
|
foreach ($mouth as $key=>$value) {
|
|
|
- $time = date('Ym',strtotime($value['month']));
|
|
|
- $data[$time] = $sist;
|
|
|
+ $arr = [
|
|
|
+ 'date'=>date('Ym',strtotime($value['month'])),
|
|
|
+ 'sbbh'=>$sist,
|
|
|
+ ];
|
|
|
+ array_push($data,$arr);
|
|
|
}
|
|
|
$this->success('成功',$data);
|
|
|
}
|