|
@@ -182,7 +182,7 @@ class AuxiliaryAccountService extends Service
|
|
|
}
|
|
}
|
|
|
$model = new ExpenseClaimsDetails();
|
|
$model = new ExpenseClaimsDetails();
|
|
|
//总金额
|
|
//总金额
|
|
|
- $list = $model->where('expense_claims_id',$month_ps_order_id)->where('del_time',0)->select("fee_id","amount as total_amount","remark","entrust_type","item_id")->get()->toArray();
|
|
|
|
|
|
|
+ $list = $model->where('expense_claims_id',$month_ps_order_id)->where('del_time',0)->select("fee_id","amount as total_amount","remark","entrust_type","item_id","r_id")->get()->toArray();
|
|
|
foreach ($list as &$v){
|
|
foreach ($list as &$v){
|
|
|
$v['entrust1_amount'] = $v['entrust_type'] == 1 ? $v['total_amount'] : 0;
|
|
$v['entrust1_amount'] = $v['entrust_type'] == 1 ? $v['total_amount'] : 0;
|
|
|
$v['entrust2_amount'] = $v['entrust_type'] == 2 ? $v['total_amount'] : 0;
|
|
$v['entrust2_amount'] = $v['entrust_type'] == 2 ? $v['total_amount'] : 0;
|