法大大修改！

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

@@ -421,7 +421,9 @@ class TenantHelper extends BaseHelper{
 	                        c.sign_source,
 	                        c.is_sign,
 	                        c.fdd_id,
+	                        c.fdd_id as contract_fdd_id,
                             rs.reservation_surrender_time,
+                            rs.fdd_id as reservation_surrender_fdd_id,
 	                        r.room_number,
 	                        r.apartment_id,
                             r.company_id,
@@ -557,11 +559,13 @@ class TenantHelper extends BaseHelper{
         $preordain_list_tmp             = [];
         $preordain_ids                  = [];
         $preordain_id_tmp               = [];
+        $preordain_fdd_id_tmp           = [];
         if (!empty($preordain_list)) {
             foreach ($preordain_list as $k => $v) {
-                $preordain_list_tmp[$v['contract_id']] = $v['money'];
-                $preordain_ids[]                       = $v['preordain_id'];
-                $preordain_id_tmp[$v['contract_id']]   = $v['preordain_id'];
+                $preordain_list_tmp[$v['contract_id']]   = $v['money'];
+                $preordain_ids[]                         = $v['preordain_id'];
+                $preordain_id_tmp[$v['contract_id']]     = $v['preordain_id'];
+                $preordain_fdd_id_tmp[$v['contract_id']] = $v['fdd_id'];
             }
             //获取补收金额
             $preordain_preordain_repair_where['preordain_id'] = ['in', $preordain_ids];
@@ -582,14 +586,17 @@ class TenantHelper extends BaseHelper{
             $surrender_where['contract_id'] = ["in",$surrender_contract_id];
             $surrender_list = $this->helper("Surrender")->getList($surrender_where);
             $surrender_list_tmp = [];
+            $surrender_fdd_id_tmp = [];
             foreach ($surrender_list as $k => $v){
-                $surrender_list_tmp[$v['contract_id']] = $v['surrender_id'];
+                $surrender_list_tmp[$v['contract_id']]   = $v['surrender_id'];
+                $surrender_fdd_id_tmp[$v['contract_id']] = $v['fdd_id'];
             }
         }
         foreach ($tenant_list_data as $k => $v) {
             //添加预定租金
             $tenant_list_data[$k]['preordain_money']    = $preordain_list_tmp[$v['contract_id']];
             $tenant_list_data[$k]['preordain_id']       = $preordain_id_tmp[$v['contract_id']];
+            $tenant_list_data[$k]['preordain_fdd_id']   = $preordain_fdd_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;
@@ -611,6 +618,7 @@ class TenantHelper extends BaseHelper{
                 $how_day         = $renewals_list[$v['contract_id']]['how_day'];
             }
             $tenant_list_data[$k]['surrender_id']      = $surrender_list_tmp[$v['contract_id']];
+            $tenant_list_data[$k]['surrender_fdd_id']  = $surrender_fdd_id_tmp[$v['contract_id']];
             $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']];
         }