|
@@ -178,10 +178,15 @@ class ApiController extends BaseController
|
|
public function sbglPeopleList(){
|
|
public function sbglPeopleList(){
|
|
$unit_id = Input::get('unit_id', '');
|
|
$unit_id = Input::get('unit_id', '');
|
|
$type = Input::get('type', '');
|
|
$type = Input::get('type', '');
|
|
- if (!$unit_id || !$type) {
|
|
|
|
|
|
+
|
|
|
|
+ if (!$unit_id) {
|
|
return self::errorResponse(ApiEnum::STATUS_CODE_EMPTY);
|
|
return self::errorResponse(ApiEnum::STATUS_CODE_EMPTY);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if($type == ''){
|
|
|
|
+ $type = 0;
|
|
|
|
+ }
|
|
|
|
+
|
|
$result['status'] = true;
|
|
$result['status'] = true;
|
|
$result['msg'] = ApiEnum::RETURN_SUCCESS;
|
|
$result['msg'] = ApiEnum::RETURN_SUCCESS;
|
|
$result['data'] = [];
|
|
$result['data'] = [];
|
|
@@ -274,9 +279,9 @@ class ApiController extends BaseController
|
|
->leftJoin('uf_zhxx_sbgl_qygl as qygl','qygl.id','=','sbgl.ssdw')
|
|
->leftJoin('uf_zhxx_sbgl_qygl as qygl','qygl.id','=','sbgl.ssdw')
|
|
->where('sbgl.ID',$params['id'])->get();
|
|
->where('sbgl.ID',$params['id'])->get();
|
|
|
|
|
|
- $sbzt = ['新设备到货验收中','完好','待修','检修中','待报废','已报废'];
|
|
|
|
- $sylx = ['在用','备用','拆除','检修','闲置'];
|
|
|
|
- $bflx = ['委外设备废品废件','废品','固定资产报废设备','代物资公司保管报废设备'];
|
|
|
|
|
|
+ // $sbzt = ['新设备到货验收中','完好','待修','检修中','待报废','已报废'];
|
|
|
|
+ // $sylx = ['在用','备用','拆除','检修','闲置'];
|
|
|
|
+ // $bflx = ['委外设备废品废件','废品','固定资产报废设备','代物资公司保管报废设备'];
|
|
|
|
|
|
foreach($data as $k=>$v){
|
|
foreach($data as $k=>$v){
|
|
$v->xsbfzr_list = [];
|
|
$v->xsbfzr_list = [];
|
|
@@ -330,13 +335,6 @@ class ApiController extends BaseController
|
|
if($v->rhzq != null){
|
|
if($v->rhzq != null){
|
|
$v->rhzq = $v->rhzq.'个月';
|
|
$v->rhzq = $v->rhzq.'个月';
|
|
}
|
|
}
|
|
- $v->sbzt = $sbzt[$v->sbzt];
|
|
|
|
- $v->sylx = $sylx[$v->sylx];
|
|
|
|
- if($v->sbzt == '已报废' && $bflx != null && $bflx != ''){
|
|
|
|
- $v->bflx = $bflx[$v->bflx];
|
|
|
|
- }else{
|
|
|
|
- $v->bflx = null;
|
|
|
|
- }
|
|
|
|
}
|
|
}
|
|
|
|
|
|
$result['data'] = $data;
|
|
$result['data'] = $data;
|