|
@@ -26,9 +26,25 @@ class GoodChange extends Base
|
|
|
$list = $this->model
|
|
|
->where($where)->json(['before','after'])
|
|
|
->order('id desc')
|
|
|
- ->paginate(["page"=>$params['page'],"list_rows"=>$params["size"]]);
|
|
|
+ ->select();
|
|
|
|
|
|
- $this->success('获取成功',['list' => $list->items(),'count' => $list->total()]);
|
|
|
+ $result = [];
|
|
|
+ foreach ($list as $item){
|
|
|
+ $keys = array_keys(get_object_vars($item['before']));
|
|
|
+ $temp = [];
|
|
|
+
|
|
|
+ foreach ($keys as $key){
|
|
|
+ $temp['field'] = \app\admin\model\GoodChange::$mapField[$key] ?? "";
|
|
|
+ $temp['before'] = $item['before']->$key ?? "";
|
|
|
+ $temp['after'] = $item['after']->$key ?? "";
|
|
|
+ $temp['apply_name'] = $item['apply_name'];
|
|
|
+ $temp['addtime'] = $item['addtime'];
|
|
|
+ }
|
|
|
+
|
|
|
+ $result[] = $temp;
|
|
|
+ }
|
|
|
+
|
|
|
+ $this->success('获取成功', $result);
|
|
|
}
|
|
|
|
|
|
//详情
|