mkm/engineering
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新细节

Browse Source
This commit is contained in:
yaooo 2023-12-19 16:47:02 +08:00
parent b6bddc5f26
commit 5bad878c07
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/adminapi/lists/expense/ExpenseReimbursementDetailLists.php
View File

@ -18,7 +18,7 @@ namespace app\adminapi\lists\expense;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\expense\ExpenseReimbursementDetail;
use app\common\lists\ListsSearchInterface;
use think\facade\Db;
/**
* ExpenseReimbursementDetail列表
@ -54,11 +54,22 @@ class ExpenseReimbursementDetailLists extends BaseAdminDataLists implements List
*/
public function lists(): array
{
return ExpenseReimbursementDetail::where($this->searchWhere)
->field(['id', 'expense_id', 'cost_subject_id', 'use_to', 'amount', 'remark'])
return Db::name('ExpenseReimbursementDetail')->alias('erd')
->where($this->searchWhere)
->whereNull('erd.delete_time')
->leftJoin('expense_reimbursement er','er.id = erd.expense_id')
->leftJoin('orgs o','o.id = er.org_id')
->leftJoin('dept d','d.id = er.dept_id')
->leftJoin('custom ct','ct.id = er.customer_id')
->field('erd.*, er.reimburser, er.reimbursement_date, er.pay_type, d.name as dept_name, o.name as org_name, ct.name as customer_name')
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()
->order(['er.id' => 'desc'])
->select()->each(function($item, $key){
//关联数据后续添加
$item['year'] = date('Y', strtotime($item['reimbursement_date']));
$item['month'] = date('m', strtotime($item['reimbursement_date']));
return $item;
})
->toArray();
}
@ -71,7 +82,13 @@ class ExpenseReimbursementDetailLists extends BaseAdminDataLists implements List
*/
public function count(): int
{
return ExpenseReimbursementDetail::where($this->searchWhere)->count();
return Db::name('ExpenseReimbursementDetail')->alias('erd')
->where($this->searchWhere)
->whereNull('erd.delete_time')
->leftJoin('expense_reimbursement er','er.id = erd.expense_id')
->leftJoin('orgs o','o.id = er.org_id')
->leftJoin('dept d','d.id = er.dept_id')
->leftJoin('custom ct','ct.id = er.customer_id')->count();
}
}