提交 2ae8d844 authored 作者: 游宗学's avatar 游宗学

修改!

上级 07a1f232
...@@ -422,7 +422,6 @@ class TenantHelper extends BaseHelper{ ...@@ -422,7 +422,6 @@ class TenantHelper extends BaseHelper{
c.is_sign, c.is_sign,
c.fdd_id, c.fdd_id,
rs.reservation_surrender_time, rs.reservation_surrender_time,
rs.entrust_surrender,
r.room_number, r.room_number,
r.apartment_id, r.apartment_id,
r.company_id, r.company_id,
...@@ -500,6 +499,17 @@ class TenantHelper extends BaseHelper{ ...@@ -500,6 +499,17 @@ class TenantHelper extends BaseHelper{
if (empty($contract_ids)) { if (empty($contract_ids)) {
return ["status" => 1, 'data' => [], "count" => 0, 'is_con_tpl_conf' => 0]; return ["status" => 1, 'data' => [], "count" => 0, 'is_con_tpl_conf' => 0];
} }
//获取委托转租数据
$reservation_surrender_where['contract_id'] = ['in',$contract_ids];
$reservation_surrender_where['entrust_surrender'] = ['eq',1];
$reservation_surrender_where['is_pay'] = ['eq',1];
$reservation_surrender_list = $this->helper("ReservationSurrender")->getList($reservation_surrender_where);
$reservation_surrender_tmp = [];
if (!empty($reservation_surrender_list)){
foreach ($reservation_surrender_list as $k => $v){
$reservation_surrender_tmp[$v['contract_id']] = $v['entrust_surrender'];
}
}
//获取上户数据 //获取上户数据
$uetoEmployeeModel = D('UetoEmployee'); $uetoEmployeeModel = D('UetoEmployee');
$ueto_where['table_id'] = ['in', $contract_ids]; $ueto_where['table_id'] = ['in', $contract_ids];
...@@ -605,6 +615,7 @@ class TenantHelper extends BaseHelper{ ...@@ -605,6 +615,7 @@ class TenantHelper extends BaseHelper{
} }
$tenant_list_data[$k]['surrender_id'] = $surrender_list_tmp[$v['contract_id']]; $tenant_list_data[$k]['surrender_id'] = $surrender_list_tmp[$v['contract_id']];
$tenant_list_data[$k]['paid_day'] = date("Y-m-d", $v['paid_day']); $tenant_list_data[$k]['paid_day'] = date("Y-m-d", $v['paid_day']);
$tenant_list_data[$k]['entrust_surrender'] = $reservation_surrender_tmp[$v['contract_id']];
} }
$reminder_list = $this->helper('Reminder')->getListDataByContractIds($contract_ids); $reminder_list = $this->helper('Reminder')->getListDataByContractIds($contract_ids);
//获取合同全部租客 //获取合同全部租客
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论