提交 89d260aa authored 作者: 游宗学's avatar 游宗学

法大大修改!

上级 adee8c1f
...@@ -593,20 +593,24 @@ class ContractLogic extends BaseLogic ...@@ -593,20 +593,24 @@ class ContractLogic extends BaseLogic
$where['tenant_id'] = ['eq',$tenant_id]; $where['tenant_id'] = ['eq',$tenant_id];
$where['is_contractor'] = ['eq',1]; $where['is_contractor'] = ['eq',1];
$tcr_list = $this->helper("TenantContractRelationship")->getList($where); $tcr_list = $this->helper("TenantContractRelationship")->getList($where)['data'];
$contract_id = []; $contract_id = [];
foreach ($tcr_list as $k => $v){ foreach ($tcr_list as $k => $v){
$contract_id[] = $v['contract_id']; $contract_id[] = $v['contract_id'];
} }
$contract_where['is_sign'] = ['eq',1];
$contract_where['c.is_sign'] = ['eq',1];
$contract_where['c.contract_id'] = ['in',$contract_id]; $contract_where['c.contract_id'] = ['in',$contract_id];
$contract_where['c.company_id'] = ['neq',0];
// 1. 租赁合同 // 1. 租赁合同
$contract_list_tmp = []; $contract_list_tmp = [];
$contract_list = D("Contract") $contract_list = D("Contract")
->field('c.fdd_id,r.room_number') ->field('c.fdd_id,r.room_number')
->alias('c') ->alias('c')
->join("room as r on('r.room_id = c.room_id')","left") ->join("room as r on(r.room_id = c.room_id)","left")
->where($contract_where) ->where($contract_where)
->select(); ->select();
foreach ($contract_list as $k => $v){ foreach ($contract_list as $k => $v){
...@@ -617,7 +621,7 @@ class ContractLogic extends BaseLogic ...@@ -617,7 +621,7 @@ class ContractLogic extends BaseLogic
$reservation_surrender_list = D("ReservationSurrender") $reservation_surrender_list = D("ReservationSurrender")
->field('c.fdd_id,r.room_number') ->field('c.fdd_id,r.room_number')
->alias('c') ->alias('c')
->join("room as r on('r.room_id = c.room_id')","left") ->join("room as r on(r.room_id = c.room_id)","left")
->where($contract_where) ->where($contract_where)
->select(); ->select();
foreach ($reservation_surrender_list as $k => $v){ foreach ($reservation_surrender_list as $k => $v){
...@@ -628,7 +632,7 @@ class ContractLogic extends BaseLogic ...@@ -628,7 +632,7 @@ class ContractLogic extends BaseLogic
$surrender_list = D('Surrender') $surrender_list = D('Surrender')
->field('s.fdd_id,r.room_number') ->field('s.fdd_id,r.room_number')
->alias('s') ->alias('s')
->join("contract as c on('s.contract_id = c.contract_id')","left") ->join("contract as c on(s.contract_id = c.contract_id)","left")
->join("room as r on('c.room_id = r.room_id')","left") ->join("room as r on('c.room_id = r.room_id')","left")
->where($contract_where) ->where($contract_where)
->select(); ->select();
...@@ -640,7 +644,7 @@ class ContractLogic extends BaseLogic ...@@ -640,7 +644,7 @@ class ContractLogic extends BaseLogic
$preordain = D("Preordain") $preordain = D("Preordain")
->field('c.fdd_id,r.room_number') ->field('c.fdd_id,r.room_number')
->alias('c') ->alias('c')
->join("room as r on('c.room_id = r.room_id')","left") ->join("room as r on(c.room_id = r.room_id)","left")
->where($contract_where) ->where($contract_where)
->select(); ->select();
foreach ($preordain as $k => $v){ foreach ($preordain as $k => $v){
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论