|
|
@@ -49,8 +49,7 @@ class OtherCountDocument extends Api
|
|
|
$arr[$k]['name'] = array_key_exists($v['Sczl_bh1'],$rs) ? trim($rs[$v['Sczl_bh1']]) : '';
|
|
|
}
|
|
|
|
|
|
- $rows[$key]['sys'] = [];
|
|
|
- array_push($rows[$key]['sys'],$arr);
|
|
|
+ $rows[$key]['sys'] = $arr;
|
|
|
$rows[$key]['date'] = str_replace('-', '', $rows[$key]['date']);
|
|
|
}
|
|
|
$this->success('成功',$rows);
|
|
|
@@ -87,6 +86,7 @@ class OtherCountDocument extends Api
|
|
|
->field('rtrim(sczl_Type) as sczl_Type, LEFT(Sczl_rq, 10) as Sczl_rq, Sczl_bh1, sczl_gdbh, CAST(Sczl_cl AS SIGNED) as Sczl_cl,
|
|
|
rtrim(Sczl_desc) as Sczl_desc, rtrim(Sczl_gxmc) as Sczl_gxmc, sczl_yjno, sczl_gxh, rtrim(sys_id) as sys_id, sys_rq, mod_rq, UniqId')
|
|
|
->where($where)
|
|
|
+ ->page($page,$limit)
|
|
|
->order('Sczl_rq asc, UniqId asc')
|
|
|
->select();
|
|
|
|