From 6181059faf135880f81d7d260c7aced2b8b02aca Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Thu, 23 Jul 2020 10:46:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/PartnerController.class.php    | 21 ++++++++++---------
 .../PromoteCompanyController.class.php        |  8 +++++++
 Application/Admin/View/Partner/lists.html     |  6 ++++--
 .../Admin/View/PromoteCompany/index.html      |  9 +++++---
 4 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/Application/Admin/Controller/PartnerController.class.php b/Application/Admin/Controller/PartnerController.class.php
index b7f2338ac..6289a3733 100644
--- a/Application/Admin/Controller/PartnerController.class.php
+++ b/Application/Admin/Controller/PartnerController.class.php
@@ -40,18 +40,19 @@ class PartnerController extends ThinkController
         if (!empty(I('partner'))) {
             $map['partner'] = ['like', '%' . I('partner') . '%'];
         }
-        if (!empty(I('timestart'))) {
-            $timestart = strtotime(I('timestart'));
-            $map['_string'] = "contract_start_time >= {$timestart}";
-        }
 
-        if (!empty(I('timeend'))) {
-            $timeend = strtotime(I('timeend') . ' 23:59:59');
-            if (!empty($map['_string'])) {
-                $map['_string'] .= " and ";
-            }
-            $map['_string'] .= " contract_end_time < {$timeend}";
+        if (isset($_REQUEST['timestart']) && isset($_REQUEST['timeend'])) {
+            $time_start = strtotime($_REQUEST['timestart']);
+            $time_end = strtotime($_REQUEST['timeend'])+ 86399;
+            $map["_string"] =  "(contract_start_time BETWEEN {$time_start} AND {$time_end}) OR (contract_end_time BETWEEN {$time_start} AND {$time_end})";
+        } elseif (isset($_REQUEST['timestart'])) {
+            $time_start = strtotime($_REQUEST['timestart']);
+            $map["_string"] =  "(contract_start_time >= {$time_start} ) OR (contract_end_time >= {$time_start})";
+        } elseif (isset($_REQUEST['timeend'])) {
+            $time_end = strtotime($_REQUEST['timeend'])+ 86399;
+            $map["_string"] =  "(contract_start_time <= {$time_end} ) OR (contract_end_time <= {$time_end})";
         }
+
         $page = intval(I('get.p', 0));
         $page = $page ? $page : 1; //默认显示第一页数据
         $row = intval(I('row', 0));
diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php
index ab7d59f93..8368ccde8 100644
--- a/Application/Admin/Controller/PromoteCompanyController.class.php
+++ b/Application/Admin/Controller/PromoteCompanyController.class.php
@@ -497,6 +497,14 @@ class PromoteCompanyController extends ThinkController
         $this->meta_title ='审核信息查看';
         $this->display("view");
     }
+    public function verifyDel(){
+        if(!isset($_REQUEST['id'])) $this->error('数据异常', U('index'));
+        $id = $_REQUEST['id'];
+
+        M("PromoteCompanyVerify", 'tab_')->where("id = '{$id}'")->delete();
+        addOperationLog(['op_type'=>2,'key'=>$id,'op_name'=>'删除审核','url'=>U('PromoteCompany/index')]);
+        $this->success('删除成功', U('index'));
+    }
 
 
     public function marketingDirectorShow($ids=[], $isShow=0)
diff --git a/Application/Admin/View/Partner/lists.html b/Application/Admin/View/Partner/lists.html
index f17b9b201..330f429d7 100644
--- a/Application/Admin/View/Partner/lists.html
+++ b/Application/Admin/View/Partner/lists.html
@@ -67,11 +67,11 @@
 
             <div class="input-list">
                 <input type="text"  id="time-start" name="timestart" class="" value="{$startDate}"
-                       placeholder="开始时间"/>
+                       placeholder="合同开始时间"/>
                 -
                 <div class="input-append date" id="datetimepicker" style="display:inline-block">
                     <input type="text"  id="time-end" name="timeend" class="" value="{$endDate}"
-                           placeholder="结束时间"/>
+                           placeholder="合同结束时间"/>
                     <span class="add-on"><i class="icon-th"></i></span>
                 </div>
             </div>
@@ -104,6 +104,7 @@
                     <th>产品类型</th>
                     <th colspan="2">游戏分成比例</th>
 
+                    <th>合同期限</th>
                     <th>结算周期</th>
                     <th>帐户名</th>
                     <th>银行账号</th>
@@ -145,6 +146,7 @@
                                 <td>-</td>
                             </notempty>
 
+                            <td rowspan="{$data.row}">{$data.contract_time}</td>
                             <td rowspan="{$data.row}">{$data.settlement_type|default="--"}</td>
                             <td rowspan="{$data.row}">{$data.payee_name|default="--"}</td>
                             <td rowspan="{$data.row}">{$data.bank_account|default="--"}</td>
diff --git a/Application/Admin/View/PromoteCompany/index.html b/Application/Admin/View/PromoteCompany/index.html
index e7493d3f4..a67558ebb 100644
--- a/Application/Admin/View/PromoteCompany/index.html
+++ b/Application/Admin/View/PromoteCompany/index.html
@@ -165,9 +165,9 @@
                             <td>{$data.contract_time}</td>
                             <td>{$data.validity_time}</td>
 
-                            <td>{$data.company_info.channel_rate}%</td>
-                            <td>{$data.company_info.fax_ratio}%</td>
-                            <td>{$data.company_info.taxation_rate}%</td>
+                            <td>{$data.company_info.channel_rate|showPercent}</td>
+                            <td>{$data.company_info.fax_ratio|showPercent}</td>
+                            <td>{$data.company_info.taxation_rate|showPercent}</td>
 
                             <td>{$data.company_info.bank_address}</td>
                             <td>{$data.company_info.bank_card}</td>
@@ -199,6 +199,9 @@
                             </td>
                             <td >
                                 <a href="{:U('verifyView',array('id'=>$data['id']))}">查看</a>
+                                <if condition="$data.verify_status elt 0 ">
+                                    <a style="color: red;" href="{:U('verifyDel',array('id'=>$data['id']))}" class="confirm ajax-get">删除</a>
+                                </if>
                             </td>
                         </tr> 
                     </volist>