报表细节优化

app/admin/controller/Export.php

@@ -5,10 +5,11 @@ namespace app\admin\controller;
 use app\admin\BaseController;
 use think\facade\Db;
 
-
+//报表导出相关
 class Export extends BaseController
 {
 
+    //相关字段的文字转换
     private $qrdType = [1 => '库存品', 2 => '非库存品', 3 => '采购反馈'];
     private $qrdSource = [1 => '直接下单', 2 => '竞价转单', 3 => '项目转单', 4 => '平台导入', 5 => '有赞平台', 6 => '售后补换货'];
     private $sendType = [1 => '包邮', 2 => '自提'];
@@ -70,7 +71,7 @@ class Export extends BaseController
         $param = $this->request->only(['start' => '', 'end' => '', 'invType' => '', 'companyNo' => '', 'relaComNo' => '', 'supplierNo' => '', 'hpNo' => '', 'payNo' => '', 'invoiceType' => '', 'status' => '', 'invoiceNumber' => '', 'checkApi' => '', 'invoiceCode' => '', 'open_start' => '', 'open_end' => '', 'apply_id' => '', 'apply_name' => ''], 'post', 'trim');
 
         $where = [['a.is_del', '=', 0], ['b.is_del', '=', 0]];
-        if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['a.addtime', 'between', [$param['start'], $param['end']]];
+        if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['a.addtime', 'between', [$param['start'] . ' 00:00:00', $param['end'] . ' 23:59:59']];
         if ($param['invType'] != '') $where[] = ['a.invType', '=', $param['invType']];
         if ($param['companyNo'] != '') $where[] = ['b.companyNo', 'like', '%' . $param['companyNo'] . '%'];
         if ($param['relaComNo'] != '') $where[] = ['b.companyNo|b.supplierNo', 'like', '%' . $param['relaComNo'] . '%'];
@@ -158,7 +159,7 @@ class Export extends BaseController
     {
         $param = $this->request->only(['start' => '', 'end' => '', 'name' => '', 'bank' => '', 'status' => '', 'tradNo' => '', 'companyNo' => '', 'userd_lower' => '', 'used_upper' => ''], 'post', 'trim');
         $where = [['a.is_del', '=', 0], ['b.is_del', '=', 0]];
-        if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['a.trade_time', 'between', [$param['start'], $param['end']]];
+        if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['a.trade_time', 'between', [$param['start'] . ' 00:00:00', $param['end'] . ' 23:59:59']];
         if ($param['name'] != '') $where[] = ['a.trade_out', 'like', '%' . $param['name'] . '%'];
         if ($param['bank'] != '') $where[] = ['a.trade_bank', 'like', '%' . $param['bank'] . '%'];
         if ($param['status'] != '') $where[] = ['a.status', '=', $param['status']];
@@ -198,7 +199,7 @@ class Export extends BaseController
 
         $where = [['a.is_del', '=', 0]];
 
-        if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['a.addtime', 'between', [$param['start'], $param['end']]];
+        if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['a.addtime', 'between', [$param['start'] . ' 00:00:00', $param['end'] . ' 23:59:59']];
         if ($param['companyNo'] != '') $where[] = ['a.companyNo', '=', $param['companyNo']];
 
         $data = Db::name('qrd_info')
@@ -235,7 +236,7 @@ class Export extends BaseController
 
         $where = [['a.is_del', '=', 0], ['b.is_del', '=', 0], ['c.is_del', '=', 0], ['d.is_del', '=', 0]];
 
-        if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['a.本次回票时间', 'between', [$param['start'], $param['end']]];
+        if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['a.check_time', 'between', [$param['start'] . ' 00:00:00', $param['end'] . ' 23:59:59']];
         if ($param['companyNo'] != '') $where[] = ['b.companyNo', '=', $param['companyNo']];
 
         $data = Db::name('pay_invoice')
@@ -287,7 +288,7 @@ class Export extends BaseController
 
         $where = [['a.is_del', '=', 0], ['b.is_del', '=', 0]];
 
-        if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['a.addtime', 'between', [$param['start'], $param['end']]];
+        if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['a.addtime', 'between', [$param['start'] . ' 00:00:00', $param['end'] . ' 23:59:59']];
         if ($param['companyNo'] != '') $where[] = ['a.companyNo', '=', $param['companyNo']];
 
         $data = Db::name('qrd_info')
@@ -301,7 +302,7 @@ class Export extends BaseController
             a.department 销售部门,
             a.ownerName 销售员,
             a.qrdSource 订单来源,
-            CONCAT("??",a.goodType) 活动类型,
+            "" 活动类型,
             a.sequenceNo 确认单编号,
             b.bkCode 备库单编号,
             b.sequenceNo 采购单单号,
@@ -375,7 +376,7 @@ class Export extends BaseController
 
         $where = [['a.is_del', '=', 0], ['d.is_del', '=', 0]];
 
-        if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['a.addtime', 'between', [$param['start'], $param['end']]];
+        if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['a.addtime', 'between', [$param['start'] . ' 00:00:00', $param['end'] . ' 23:59:59']];
         if ($param['companyNo'] != '') $where[] = ['a.inv_out', '=', $param['companyNo']];
 
         $data = Db::name('invoice_pool')
@@ -386,8 +387,8 @@ class Export extends BaseController
             b.seller_title 销售方抬头,
             e.department 业务部门,
             e.ownerName 业务人员,
-            "??" 本次开票数量,
-            "??" 本次开票金额,
+            e.goodNum 本次开票数量,
+            d.cancel_fee 本次开票金额,
             a.addtime 本次开票时间,
             c.inv_number 发票号,
             e.tax 开票税点,
@@ -454,7 +455,7 @@ class Export extends BaseController
 
         $where = [['a.is_del', '=', 0], ['b.is_del', '=', 0]];
 
-        if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['a.addtime', 'between', [$param['start'], $param['end']]];
+        if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['a.addtime', 'between', [$param['start'] . ' 00:00:00', $param['end'] . ' 23:59:59']];
         if ($param['companyNo'] != '') $where[] = ['a.companyNo', '=', $param['companyNo']];
 
         $data = Db::name('qrd_info')
@@ -491,7 +492,7 @@ class Export extends BaseController
             a.inv_fee 开票中,
             a.winv_fee 总未开票,
             a.inv_tag_fee 开票标签金额,
-            "??" 最近开票时间,
+            a.invtime 最近开票时间,
             d.addtime 业务提票时间,
             a.paytime 最近回款时间,
             0 账期,
@@ -499,7 +500,7 @@ class Export extends BaseController
             "" 订单是否超期,
             "" 开票是否超期,
             b.sendStatus 发货状态,
-            "??" 最近一次发货时间            
+            "" 最近一次发货时间            
             ')
             ->leftJoin('cgd_info b', 'b.qrdCode=a.sequenceNo')
             ->leftJoin('assoc c', 'c.orderCode=a.sequenceNo')
@@ -523,8 +524,12 @@ class Export extends BaseController
             $value['比率'] = round(bcdiv($value['账期'], 30, 1));
             $value['订单是否超期'] = $value['比率'] > 6 ? '是' : '否';
 
-            $value['开票是否超期'] = '??';//因为'最近开票时间'不清楚
-//            $value['开票是否超期'] = round(bcdiv(bcsub($time,$value['最近开票时间'],1),86400,1))>15?'是':'否';
+            $value['开票是否超期'] = round(bcdiv(bcsub($time, $value['最近开票时间'], 1), 86400, 1)) > 15 ? '是' : '否';
+
+            $value['最近一次发货时间'] = Db::table('fh_source')
+                ->where(['qrdNo' => $value['销售单编号']])
+                ->order(['id' => 'desc'])
+                ->value('send_date', '');
 
             unset($value['addtime']);
             $list[] = $value;
@@ -543,7 +548,7 @@ class Export extends BaseController
 
         $where = [['a.is_del', '=', 0], ['c.is_del', '=', 0], ['d.is_del', '=', 0], ['e.is_del', '=', 0]];
 
-        if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['a.addtime', 'between', [$param['start'], $param['end']]];
+        if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['a.addtime', 'between', [$param['start'] . ' 00:00:00', $param['end'] . ' 23:59:59']];
         if ($param['companyNo'] != '') $where[] = ['e.companyNo', '=', $param['companyNo']];
 
         $data = Db::name('pay_invoice')