提交 6791f177 authored 作者: 游宗学's avatar 游宗学

合同列表修改!

上级 7e77136c
......@@ -544,6 +544,7 @@ class TenantHelper extends BaseHelper{
$preordain_list = $PreordainModel->where($preordain_where)->select();
$preordain_list_tmp = [];
$preordain_ids = [];
$preordain_id_tmp = [];
if (!empty($preordain_list)) {
foreach ($preordain_list as $k => $v) {
$preordain_list_tmp[$v['contract_id']] = $v['money'];
......@@ -560,6 +561,7 @@ class TenantHelper extends BaseHelper{
foreach ($preordain_list as $k => $v) {
$repair_money = $preordain_repair_list_tmp[$v['preordain_id']];
$preordain_list_tmp[$v['contract_id']] = $repair_money + $v['money'];
$preordain_id_tmp[$v['contract_id']] = $v['preordain_id'];
}
}
}
......@@ -576,7 +578,8 @@ class TenantHelper extends BaseHelper{
// }
foreach ($tenant_list_data as $k => $v) {
//添加预定租金
$tenant_list_data[$k]['preordain_money'] = $preordain_list_tmp[$v['contract_id']];
$tenant_list_data[$k]['preordain_money'] = $preordain_list_tmp[$v['contract_id']];
$tenant_list_data[$k]['preordain_id'] = $preordain_id_tmp[$v['contract_id']];
// 添加bill门店账单时间
//$tenant_list_data[$k]['store_billing_time'] = $contract_tmp[$v['contract_id']] ? date('Y-m-d', $contract_tmp[$v['contract_id']]) :'';
$advance_pay_rent_day = $v['advance_pay_rent_day'] * 86400;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论