修改！

PHP/Application/Client/Conf/config.php

@@ -2,7 +2,7 @@
 return array(
 
     //APP最高级别调试权限
-    'APP_BASE_DUBUG' => 0,
+    'APP_BASE_DUBUG' => 1,
     //调试模式
     'IS_DEBUG' => 0,
 

PHP/Application/Common/Logic/Api/ContractLogic.class.php

@@ -608,38 +608,58 @@ class ContractLogic extends BaseLogic
         // 1. 租赁合同
         $contract_list_tmp = [];
         $contract_list = D("Contract")
-            ->field('c.fdd_id,r.room_number')
+            ->field('c.fdd_id,r.room_number,c.contract_id,r.apartment_id,c.begin_time,c.end_time')
             ->alias('c')
             ->join("room as r on(r.room_id = c.room_id)","left")
             ->where($contract_where)
             ->select();
         foreach ($contract_list as $k => $v){
-            $contract_list_tmp[] = ['fdd_id'=>$v['fdd_id'],'room_number'=>$v['room_number'],'name'=>"租赁合同".$v['room_number'].'号'];
+            $contract_list_tmp[] = ['fdd_id'        =>$v['fdd_id'],
+                                    'room_number'   =>$v['room_number'],
+                                    'apartment_id'  =>$v['apartment_id'],
+                                    'agreement_type'=>"租赁合同".$v['room_number'].'号',
+                                    'contract_cycle'=>date("Y.m.d",$v['begin_time']).'-'.date("Y.m.d",$v['end_time']),
+                                    'begin_time'    =>$v['begin_time']
+                                    ];
         }
         // 2. 转租协议
         $reservation_surrender_list_tmp = [];
         $reservation_surrender_list = D("ReservationSurrender")
-            ->field('c.fdd_id,r.room_number')
+            ->field('c.fdd_id,r.room_number,c.contract_id,r.apartment_id,c.create_time')
             ->alias('c')
             ->join("room as r on(r.room_id = c.room_id)","left")
             ->where($contract_where)
             ->select();
         foreach ($reservation_surrender_list as $k => $v){
-            $reservation_surrender_list_tmp[] = ['fdd_id'=>$v['fdd_id'],'room_number'=>$v['room_number'],'name'=>"转租协议".$v['room_number'].'号'];
+            $reservation_surrender_list_tmp[] = [
+                'fdd_id'        =>$v['fdd_id'],
+                'room_number'   =>$v['room_number'],
+                'apartment_id'  =>$v['apartment_id'],
+                'agreement_type'=>"转租协议".$v['room_number'].'号',
+                'contract_cycle'=>date("Y.m.d",$v['begin_time']).'-'.date("Y.m.d",$v['end_time']),
+                'begin_time'    =>$v['begin_time']
+            ];
         }
         // 3. 合同解除协议
         $surrender_list_tmp = [];
         $surrender_where["s.is_sign"] = ['eq',1];
         $surrender_where = array_merge($surrender_where,$contract_where);
         $surrender_list = D('Surrender')
-            ->field('s.fdd_id,r.room_number')
+            ->field('s.fdd_id,r.room_number,c.contract_id,r.apartment_id,c.begin_time,c.end_time')
             ->alias('s')
             ->join("contract as c on(s.contract_id = c.contract_id)","left")
             ->join("room as r on(c.room_id = r.room_id)","left")
             ->where($surrender_where)
             ->select();
         foreach ($surrender_list as $k => $v){
-            $surrender_list_tmp[] = ['fdd_id'=>$v['fdd_id'],'room_number'=>$v['room_number'],'name'=>"合同解除协议".$v['room_number'].'号'];
+            $surrender_list_tmp[] = [
+                'fdd_id'        =>$v['fdd_id'],
+                'room_number'   =>$v['room_number'],
+                'apartment_id'  =>$v['apartment_id'],
+                'agreement_type'=>"合同解除协议".$v['room_number'].'号',
+                'contract_cycle'=>date("Y.m.d",$v['begin_time']).'-'.date("Y.m.d",$v['end_time']),
+                'begin_time'    =>$v['begin_time']
+            ];
         }
         //4预定协议
         $preordain_tmp = [];
@@ -647,17 +667,38 @@ class ContractLogic extends BaseLogic
         $preordain_where['c.tenant_id']   = ['eq',$tenant_id];
         $preordain_where['c.company_id']  = ['neq',0];
         $preordain = D("Preordain")
-            ->field('c.fdd_id,r.room_number')
+            ->field('c.fdd_id,r.room_number,c.contract_id,r.apartment_id,c.begin_time,c.end_time')
             ->alias('c')
             ->join("room as r on(c.room_id = r.room_id)","left")
             ->where($preordain_where)
             ->select();
         foreach ($preordain as $k => $v){
-            $preordain_tmp[] = ['fdd_id'=>$v['fdd_id'],'room_number'=>$v['room_number'],'name'=>"定金协议".$v['room_number'].'号'];
+            $preordain_tmp[] = [
+                'fdd_id'        =>$v['fdd_id'],
+                'room_number'   =>$v['room_number'],
+                'apartment_id'  =>$v['apartment_id'],
+                'agreement_type'=>"定金协议".$v['room_number'].'号',
+                'contract_cycle'=>date("Y.m.d",$v['begin_time']).'-'.date("Y.m.d",$v['end_time']),
+                'begin_time'    =>$v['begin_time']
+            ];
         }
         //定金协议
         $data = array_merge($contract_list_tmp,$reservation_surrender_list_tmp,$surrender_list_tmp,$preordain_tmp);
-        return RD('成功', $data, 1);
+        $list_tmp = [];
+        $apartment_id = [];
+        foreach ($data as $k => $v){
+            $list_tmp[$v['apartment_id']][] = $v;
+            $apartment_id[] = $v['apartment_id'];
+        }
+        if (!empty($apartment_id)){
+            $apartment_where['apartment_id'] = ['in',$apartment_id];
+            $apartment_list = $this->helper('Apartment')->getList($apartment_where)['data'];
+            $apartment_list_tmp = [];
+            foreach ($apartment_list as $k => $v){
+                $apartment_list_tmp[] = ['apartment_id'=>$v['apartment_id'],'apartment_name'=>$v['apartment_name'],'contract_list'=>$list_tmp[$v['apartment_id']]];
+            }
+        }
+        return RD('成功', $apartment_list_tmp, 1);
     }
     /**
     * @desc 获取租客法大大PDF签约预览地址