修改导出分佣提成明细表

application/index/controller/Finance.php

@@ -494,11 +494,11 @@ class Finance extends Basic
         $where['a.confirm_status'] = 1;
 
         if(!empty($this->params['create_time']) && empty($this->params['end_time'])) {
-            $where['a.confirm_date'] = ['> time', $this->params['create_time']];
+            $where['a.confirm_date'] = ['>= time', $this->params['create_time']];
         }
 
         if(!empty($this->params['end_time']) && empty($this->params['create_time'])) {
-            $where['a.confirm_date'] = ['< time', $this->params['create_time']];
+            $where['a.confirm_date'] = ['<= time', $this->params['create_time']];
         }
 
         if (!empty($this->params['end_time']) && !empty($this->params['create_time'])) {
@@ -539,17 +539,19 @@ class Finance extends Basic
     public function exportExcel() {
         $pageNo   = 1;
         $pageSize = 250000;
+        $where    = [];
+        $where['a.confirm_status'] = 1;
 
         if(!empty($this->params['create_time']) && empty($this->params['end_time'])) {
-            $where['a.create_time'] = ['> time', $this->params['create_time'] . ' 00:00:00'];
+            $where['a.confirm_date'] = ['>= time', $this->params['create_time']];
         }
 
         if(!empty($this->params['end_time']) && empty($this->params['create_time'])) {
-            $where['a.create_time'] = ['< time', $this->params['create_time'] . ' 23:59:59'];
+            $where['a.confirm_date'] = ['<= time', $this->params['create_time']];
         }
 
         if (!empty($this->params['end_time']) && !empty($this->params['create_time'])) {
-            $where['a.create_time'] = ['between time', [$this->params['create_time'] . ' 00:00:00', $this->params['create_time'] . ' 23:59:59']];
+            $where['a.confirm_date'] = ['between time', [$this->params['create_time'], $this->params['create_time']]];
         }
 
         if (!empty($this->params['internal_address'])) {
@@ -568,15 +570,15 @@ class Finance extends Basic
             $where['b.house_number'] = ['like', '%'.$this->params['house_number'].'%'];
         }
 
-        $where = [];
-        $field = 'a.id,a.create_time,a.practical_fee,b.scale_fee,d.internal_address,b.agent_id,cash,service_charge,tallAge,charity_fund,real_fee';
+        $field = 'a.id,a.confirm_date,a.practical_fee,b.scale_fee,d.internal_address,b.agent_id,cash,service_charge,tallAge,charity_fund,real_fee';
 
         $m_commission = new OPartialCommission();
 
         $data = $m_commission->getCommissionBargainColumn($pageNo, $pageSize, 'a.id desc', $field, $where);
 
         $export = new ExportExcelUntil();
-        $export->exportTable('分佣提成明细',$data, 8);
+        $title = ['收佣日期','所属部门/门店','业务员','应分佣金（元）','实分佣金（元）','手续费（元）','慈善基金（元）','现金奖（元）','实收佣金（元）'];
+        $export->exportTable('分佣提成明细',$data, 8, '分佣提成明细表', $title);
         return ;
     }
 

application/index/untils/ExportExcelUntil.php

@@ -16,7 +16,7 @@ class ExportExcelUntil
      * @param $data
      * @param $row
      */
-    public function exportTable(string $file_name, array $data, int $row) {
+    public function exportTable(string $file_name, array $data, int $row, $table_title = "", array $title = []) {
         $filename = $file_name. '-' .date('YmdHis').".xlsx";
         //设置 header，用于浏览器下载
         header('Content-disposition: attachment; filename="'.$filename.'"');
@@ -28,8 +28,8 @@ class ExportExcelUntil
         $styles1 = array( 'font'=>'Arial','font-size'=>12,'font-style'=>'bold', 'fill'=>'#eee', 'halign'=>'center', 'border'=>'left,right,top,bottom','border-style'=>'thin','Valign'=>'center','height'=>20);
 
         $class_xls->writeSheetHeader('Sheet1', ['string'],['suppress_row'=>true,'widths'=>[20,25,20,30,30,20,30,20,30]]);
-        $class_xls->writeSheetRow('Sheet1', ['分佣提成明细表'],['height'=>32,'font-size'=>20,'font-style'=>'bold','halign'=>'center','valign'=>'center']);
-        $class_xls->writeSheetRow('Sheet1', ['收佣日期','所属部门/门店','业务员','应分佣金（元）','实分佣金（元）','手续费（元）','慈善基金（元）','现金奖（元）','实收佣金（元）'] ,$styles1);
+        $class_xls->writeSheetRow('Sheet1', [$table_title],['height'=>32,'font-size'=>20,'font-style'=>'bold','halign'=>'center','valign'=>'center']);
+        $class_xls->writeSheetRow('Sheet1', $title, $styles1);
 
         foreach ($data as $k=>$v) {
             $row_data = array_values($v);