|
|
@@ -471,6 +471,11 @@ class Decision extends Api
|
|
|
if (empty($param) || !isset($param['year'])){
|
|
|
$this->error('参数错误');
|
|
|
}
|
|
|
+ $total = \db('工单_质量考核汇总')
|
|
|
+ ->where('sys_ny', 'like', $param['year'] . '%')
|
|
|
+ ->where('工序名称','not like','%机检%')
|
|
|
+ ->where('工序名称','not like','%拆片%')
|
|
|
+ ->count();
|
|
|
if (isset($param['page']) && isset($param['limit']))
|
|
|
{
|
|
|
$list = \db('工单_质量考核汇总')
|
|
|
@@ -555,6 +560,8 @@ class Decision extends Api
|
|
|
//
|
|
|
// return $numberA <=> $numberB; // 使用太空船运算符进行比较
|
|
|
// });
|
|
|
- $this->success('成功',$list);
|
|
|
+ $data['data'] = $list;
|
|
|
+ $data['total'] = $total;
|
|
|
+ $this->success('成功',$data);
|
|
|
}
|
|
|
}
|