实收汇总成交报告搜索

application/index/controller/Finance.php

@@ -1456,6 +1456,30 @@ class Finance extends Basic
         }
 
         /**收佣日期 end**/
+
+        if (!empty($this->params['bargain_start_date']) && empty($this->params['bargain_end_date'])) {
+            $where .= " AND e.create_time > '{$this->params['bargain_start_date']} 00:00:00' AND c.operation_date > '{$this->params['bargain_start_date']}'";
+
+            $operation_date = date('Y.m.d', strtotime($this->params['bargain_start_date']));
+            $operation_start_data = $this->params['bargain_start_date'] . ' 00:00:00';
+        }
+
+        if (!empty($this->params['bargain_end_date']) && empty($this->params['bargain_start_date'])) {
+            $where .= " AND e.create_time < '{$this->params['bargain_end_date']} 23:59:59' AND c.operation_date > '{$this->params['bargain_end_date']}'";
+            $operation_date = date('Y.m.d', strtotime($this->params['bargain_end_date']));
+
+            $operation_end_data = $this->params['bargain_end_date'] . ' 23:59:59';
+        }
+
+        if (!empty($this->params['bargain_start_date']) && !empty($this->params['bargain_end_date'])) {
+            $where .= " AND e.create_time BETWEEN '{$this->params['bargain_start_date']} 00:00:00' AND '{$this->params['bargain_end_date']} 23:59:59' ";
+            $where .= " AND c.operation_date BETWEEN '{$this->params['bargain_start_date']}' AND '{$this->params['bargain_end_date']}'";
+            $operation_date = date('Y.m.d', strtotime($this->params['bargain_start_date'])) . '-' . date('Y.m.d', strtotime($this->params['bargain_end_date']));
+
+            $operation_start_data = $this->params['bargain_start_date'] . ' 00:00:00';
+            $operation_end_data   = $this->params['bargain_end_date'] . ' 23:59:59';
+        }
+
         /**部门id**/
         if (!empty($this->params['district_id'])) {
             $where .= " AND d.district_id={$this->params['district_id']}";

application/index/view/finance/commission_total.html

@@ -147,7 +147,7 @@
 												<span class="btn btn-info btn3 " id="reset">重置</span>
 												<span class="btn btn-info btn3 " id="export">导出excel</span>
 												<span style="margin-left: 5px;font-size: 16px;font-weight: 600;">
-													最终实收总计：<span class="total-money"></span>元
+													实收总计：<span class="total-money"></span>元
 												</span>
 												<span style="margin-left: 5px;font-size: 16px;font-weight: 600;">
 													税费总计：<span class="total-taxes"></span>元