Merge branch 'feature/finance_statement_three' of wmtx/platform into master

优化上游结算检索

Application/Admin/Controller/CompanyStatementController.class.php

@@ -54,13 +54,13 @@ class CompanyStatementController extends ThinkController
         if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) {
             $time_start = strtotime($_REQUEST['time_start']);
             $time_end = strtotime($_REQUEST['time_end'])+ 86399;
-            $map["_string"] =  "(statement_begin_time BETWEEN {$time_start} AND {$time_end}) OR (statement_end_time BETWEEN {$time_start} AND {$time_end})";
+            $map["_string"] =  "( (statement_begin_time BETWEEN {$time_start} AND {$time_end}) OR (statement_end_time BETWEEN {$time_start} AND {$time_end}) )";
         } elseif (isset($_REQUEST['time_start'])) {
             $time_start = strtotime($_REQUEST['time_start']);
-            $map["_string"] =  "(statement_begin_time >= {$time_start} ) OR (statement_end_time >= {$time_start})";
+            $map["_string"] =  "( (statement_begin_time >= {$time_start} ) OR (statement_end_time >= {$time_start})  )";
         } elseif (isset($_REQUEST['time_end'])) {
             $time_end = strtotime($_REQUEST['time_end'])+ 86399;
-            $map["_string"] =  "(statement_begin_time <= {$time_end} ) OR (statement_end_time <= {$time_end})";
+            $map["_string"] =  "( (statement_begin_time <= {$time_end} ) OR (statement_end_time <= {$time_end})  )";
         }
 
         if (isset($_REQUEST['time_start2']) && isset($_REQUEST['time_end2'])) {
@@ -144,7 +144,7 @@ class CompanyStatementController extends ThinkController
         if(isset($_REQUEST['confirm_status'])){
             $map['confirm_status'] = $_REQUEST['confirm_status'];
         }
-
+        // dd($map);
         // $this->checkListOrCountAuthRestMap($map);//导出权限
         //条件end
         $data = M("company_statement","tab_")