合同列表修改！

PHP/Application/Common/Helper/TenantHelper.class.php

@@ -456,6 +456,7 @@ class TenantHelper extends BaseHelper{
         $room_ids         = [];
         $contract_term    = [];
         $isSigned         = $contractModel::$isSigned;
+        $surrender_contract_id = [];
         foreach ($tenant_list_data as $k => $v) {
             $advance_pay_rent_day = $v['advance_pay_rent_day'];
             $nex_pay_day          = convert_pay($temp_pay_config[$v['how_pay']]);
@@ -490,6 +491,9 @@ class TenantHelper extends BaseHelper{
             $pdfUrl                          = $http . '://' . $url_data . '/ContractIous/getPDFById';
             $tenant_list_data[$k]['pdf_url'] = $pdfUrl;
             $contract_ids[]                   = $v['contract_id'];
+            if ( $v['surrender_time'] ){
+                $surrender_contract_id[] = $v['contract_id'];
+            }
             $contract_term[$v['contract_id']] = $v['term'];
         }
         if (empty($contract_ids)) {
@@ -565,17 +569,15 @@ class TenantHelper extends BaseHelper{
                 }
             }
         }
-        // 获得bill信息
-// 	    $contract_data = D('Contract')
-// 	    	->field('c.contract_id, b.store_billing_time')
-// 	    	->alias('c')
-// 	    	->join('bill b ON b.bill_id = c.bill_id', 'left')
-// 	    	->where(array('c.contract_id' => array('in', $contract_ids)))
-// 	    	->select();
-// 	    $contract_tmp = array();
-// 	    foreach ($contract_data as $k => $v) {
-// 	    	$contract_tmp[$v['contract_id']] = $v['store_billing_time'];
-// 	    }
+        //获取退租合同退租信息
+        if (!empty($surrender_contract_id)){
+            $surrender_where['contract_id'] = ["in",$surrender_contract_id];
+            $surrender_list = $this->helper("Surrender")->getList($surrender_where);
+            $surrender_list_tmp = [];
+            foreach ($surrender_list as $k => $v){
+                $surrender_list_tmp[$v['contract_id']] = $v['surrender_id'];
+            }
+        }
         foreach ($tenant_list_data as $k => $v) {
             //添加预定租金
             $tenant_list_data[$k]['preordain_money']    = $preordain_list_tmp[$v['contract_id']];
@@ -599,15 +601,8 @@ class TenantHelper extends BaseHelper{
                 $paid_start_time = $v['paid_day'];
                 $how_pay         = $renewals_list[$v['contract_id']]['how_pay'];
                 $how_day         = $renewals_list[$v['contract_id']]['how_day'];
-                /*    if ($how_pay>0){
-                       $nex_pay_time = strtotime('+ '.$how_pay.' month',$paid_start_time);
-                       $nex_pay_time = strtotime('- '.$advance_pay_rent_day.' days',$nex_pay_time);
-                   }
-                   if ($how_day > 0){
-                       $nex_pay_time = strtotime('+ '.$how_day.' day',$paid_start_time);
-                   }
-                   $tenant_list_data[$k]['nex_pay_time'] = date("Y-m-d",$nex_pay_time); */
             }
+            $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']);
         }
         $reminder_list = $this->helper('Reminder')->getListDataByContractIds($contract_ids);