|
|
@@ -58,7 +58,7 @@ class EngineerBillLists extends BaseAdminDataLists implements ListsSearchInterfa
|
|
|
$deadline_time = strtotime($this->params['deadline_time'])+86400;
|
|
|
$settlement_type = $this->params['settlement_type'];
|
|
|
return Db::name('master_worker')->alias('a')->field([
|
|
|
- 'a.id','a.real_name','a.nickname','a.worker_number','e.account_holder','e.bank_name','e.opening_branch','e.account as bank_account',
|
|
|
+ 'a.id','a.real_name','a.nickname','a.worker_number','a.user_money','e.account_holder','e.bank_name','e.opening_branch','e.account as bank_account',
|
|
|
Db::raw("sum(b.amount_change) as left_amount")
|
|
|
])
|
|
|
->leftJoin('master_settlement_details b', 'a.id = b.master_worker_id AND b.status = 1')
|
|
|
@@ -104,7 +104,7 @@ class EngineerBillLists extends BaseAdminDataLists implements ListsSearchInterfa
|
|
|
$deadline_time = strtotime($this->params['deadline_time'])+86400;
|
|
|
$settlement_type = $this->params['settlement_type'];
|
|
|
return Db::name('master_worker')->alias('a')->field([
|
|
|
- 'a.id','a.real_name','a.nickname','a.worker_number','e.account_holder','e.bank_name','e.opening_branch','e.account as bank_account',
|
|
|
+ 'a.id','a.real_name','a.nickname','a.worker_number','a.user_money','e.account_holder','e.bank_name','e.opening_branch','e.account as bank_account',
|
|
|
Db::raw("sum(amount_change) as left_amount")
|
|
|
])
|
|
|
->leftJoin('master_settlement_details b', 'a.id = b.master_worker_id AND b.status = 1')
|