Merge branch 'dev' of https://git.lefull.cn/yzx/lxx_pms into dev

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,
@@ -457,6 +459,8 @@ class TenantHelper extends BaseHelper{
         $contract_term    = [];
         $isSigned         = $contractModel::$isSigned;
         $surrender_contract_id = [];
+        $url_data                        = SITE_DOMAIN;
+        $http                            = 'https';
         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']]);
@@ -483,8 +487,6 @@ class TenantHelper extends BaseHelper{
             $tenant_list_data[$k]['reservation_surrender_time'] = $v['reservation_surrender_time'] > 0 ? date("Y-m-d", $v['reservation_surrender_time']) : '';
             $tenant_list_data[$k]['surrender_time']             = $v['surrender_time'] ? date('Y-m-d', $v['surrender_time']) : '';
             $tenant_list_data[$k]['sign_status']                = $isSigned[$tenant_list_data[$k]['is_sign']];
-            $url_data                        = SITE_DOMAIN;
-            $http                            = 'https';
             $pdfUrl                          = $http . '://' . $url_data . '/ContractIous/getPDFById';
             $tenant_list_data[$k]['pdf_url'] = $pdfUrl;
             $contract_ids[]                   = $v['contract_id'];
@@ -557,10 +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_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];
@@ -573,7 +578,6 @@ class TenantHelper extends BaseHelper{
                 foreach ($preordain_list as $k => $v) {
                     $repair_money                          = $preordain_repair_list_tmp[$v['preordain_id']];
                     $preordain_list_tmp[$v['contract_id']] = $repair_money + $v['money'];
-                    $preordain_id_tmp[$v['contract_id']]   = $v['preordain_id'];
                 }
             }
         }
@@ -582,14 +586,22 @@ 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) {
+            //合同法大大ID
+            $tenant_list_data[$k]['contract_fdd_vue_url']   = $http . '://' . $url_data ."/Tenant/getFddPDFView/fdd_id/".$v['contract_fdd_id'];
+            //转租法大大ID
+            $tenant_list_data[$k]['reservation_surrender_vue_url']   = $http . '://' . $url_data ."/Tenant/getFddPDFView/fdd_id/".$v['reservation_surrender_fdd_id'];
+
             //添加预定租金
             $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_vue_url']   = $http . '://' . $url_data ."/Tenant/getFddPDFView/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 +623,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_vue_url']   = $http . '://' . $url_data ."/Tenant/getFddPDFView/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']];
         }

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

@@ -70,6 +70,9 @@ class ContractLogic extends BaseLogic
             $return_data[$k]['room_number']              = $v['room_number'];
             $return_data[$k]['apartment_id']             = $v['apartment_id'];
             $return_data[$k]['is_renewal']               = $v['is_renewal'];
+            if ($v['end_time'] == $v['paid_day']){
+                $return_data[$k]['is_renew']             = 3;
+            }
             //修改接口
 //            $return_data[$k]['apartment_name']           = $v['apartment_name'];
 //            $return_data[$k]['alias_info']               = $v['alias_info'];
@@ -595,6 +598,9 @@ class ContractLogic extends BaseLogic
         $where['tenant_id']    = ['eq',$tenant_id];
         $where['is_contractor'] = ['eq',1];
         $tcr_list = $this->helper("TenantContractRelationship")->getList($where)['data'];
+        if (empty($tcr_list)){
+            return RD('暂无数据', [], 1);
+        }
         $contract_id = [];
         foreach ($tcr_list as $k => $v){
             $contract_id[] = $v['contract_id'];

PHP/Application/Common/Logic/Message/MessageLogic.class.php

@@ -177,7 +177,7 @@ class MessageLogic extends BaseLogic
                 break;
 
             case GeneralMessagePushModel::$push_code['APPLY_RENEWALS']:
-                $datas['message_type'] = '1';
+                $datas['message_type'] = '2';
                 $datas['message_name'] = $room['room_number'].'房间申请续租';
                 break;
             default:

PHP/Application/Index/Controller/TenantController.class.php

@@ -1175,4 +1175,15 @@ class TenantController extends \Common\Controller\BaseController{
                  $this->ajaxReturn("修改失败");
              }
     }
+    /**
+     * @desc 获取法大大签约协议预览
+     * @author yzx
+     * @version 2020-06-22 14:05:06
+     */
+    public function getFddPDFView()
+    {
+        $fdd_id = I('fdd_id');
+        $res = $this->logic('Api\Contract')->getFddPDFViewLogic($fdd_id);
+        $this->ajaxReturn($res);
+    }
 }
\ No newline at end of file