Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
fad8725593
@ -15,6 +15,7 @@
|
|||||||
use app\common\model\dict\DictData;
|
use app\common\model\dict\DictData;
|
||||||
use app\common\model\task_scheduling\TaskScheduling;
|
use app\common\model\task_scheduling\TaskScheduling;
|
||||||
use app\common\model\user\User;
|
use app\common\model\user\User;
|
||||||
|
use app\common\model\CompanyDepositVoucher;
|
||||||
use think\facade\Db;
|
use think\facade\Db;
|
||||||
use think\facade\Log;
|
use think\facade\Log;
|
||||||
use think\response\Json;
|
use think\response\Json;
|
||||||
@ -327,4 +328,32 @@
|
|||||||
}
|
}
|
||||||
return $this->success('success', array_unique($data));
|
return $this->success('success', array_unique($data));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getDepositRechargeTransferVoucherList()
|
||||||
|
{
|
||||||
|
if(!$this->request->isPost()){
|
||||||
|
return $this->fail('请求方式错误');
|
||||||
|
}
|
||||||
|
$params = $this->request->post(['page_no','page_size', 'account', 'mobile', 'company_id']);
|
||||||
|
$where = [];
|
||||||
|
if(isset($params['company_id']) && $params['company_id'] > 0){
|
||||||
|
$where[] = ['company_id', '=', $params['company_id']];
|
||||||
|
}
|
||||||
|
$pageNo = !empty($params['page_no']) ? $params['page_no'] : 1;
|
||||||
|
$pageSize = !empty($params['page_size']) ? $params['page_size'] : 20;
|
||||||
|
$lists = CompanyDepositVoucher::where($where)
|
||||||
|
->page($pageNo, $pageSize)
|
||||||
|
->order(['id' => 'desc'])
|
||||||
|
->select()
|
||||||
|
->toArray();
|
||||||
|
$count=CompanyDepositVoucher::where($where)->count();
|
||||||
|
|
||||||
|
$result = [
|
||||||
|
'lists' => $lists,
|
||||||
|
'count' => $count,
|
||||||
|
'page_no' => $pageNo,
|
||||||
|
'page_size' => $pageSize
|
||||||
|
];
|
||||||
|
return $this->success('请求成功',$result);
|
||||||
|
}
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user