字段修改

application/index/controller/Finance.php

@@ -331,7 +331,7 @@ class Finance extends Basic
                     foreach ($list_data as $k=>$v) {
                         $excel_data[$k]['id'] = $v['id'];
                         $excel_data[$k]['create_time'] = $v['create_time'];
-                        $excel_data[$k]['is_open'] = $v['is_open'] ? '是':'否';
+//                        $excel_data[$k]['is_open'] = $v['is_open'] ? '是':'否';
                         $excel_data[$k]['internal_address'] = $v['internal_address'];
                         $excel_data[$k]['house_number'] = $v['house_number'];
                         $excel_data[$k]['price'] = $v['price'];
@@ -343,7 +343,7 @@ class Finance extends Basic
                         $excel_data[$k]['subtract'] = $v['commission'] - $excel_data[$k]['income_money'];
                     }
                     $export = new ExportExcelUntil();
-                    $title  = [ 'ID', '提交时间', '是否开业', '商铺地址', '商铺号', '成交价', '提交人', '成交类型', '应收佣金（元）','已收佣金（元）','未收佣金（元）' ];
+                    $title  = [ 'ID', '提交时间', '商铺地址', '商铺号', '成交价', '提交人', '成交类型', '应收佣金（元）','已收佣金（元）','未收佣金（元）' ];
                     $export->exportTable($excel_title, $excel_data, 11, $excel_title, $title);
                 }
             }
@@ -2922,19 +2922,19 @@ class Finance extends Basic
         }
         /*入账日期 end*/
         /*收款确认日期 start*/
-        if (!empty($this->params['open_start_time']) && empty($this->params['open_end_time'])) {
-            $where['a.open_time'] = ['> time', $this->params['open_start_time'] . ' 00:00:00'];
+        if (!empty($this->params['open_time_start']) && empty($this->params['open_end_time'])) {
+            $where['a.open_time'] = ['> time', $this->params['open_time_start'] . ' 00:00:00'];
             $is_show = 1;
         }
 
-        if (!empty($this->params['open_end_time']) && empty($this->params['open_start_time'])) {
-            $where['a.open_time'] = ['< time', $this->params['open_end_time'] . ' 23:59:59'];
+        if (!empty($this->params['open_time_end']) && empty($this->params['open_time_start'])) {
+            $where['a.open_time'] = ['< time', $this->params['open_time_end'] . ' 23:59:59'];
             $is_show = 1;
         }
 
-        if (!empty($this->params['open_end_time']) && !empty($this->params['open_start_time'])) {
+        if (!empty($this->params['open_time_end']) && !empty($this->params['open_time_start'])) {
             $where['a.open_time'] = ['between time', [
-                $this->params['open_start_time'] . ' 00:00:00', $this->params['open_end_time'] . ' 23:59:59'
+                $this->params['open_time_start'] . ' 00:00:00', $this->params['open_time_end'] . ' 23:59:59'
             ]];
             $is_show = 1;
         }