youfeng

app/Service/ExportFileService.php

@@ -365,6 +365,11 @@ class ExportFileService extends Service
                 $this->fillData($list['data'], $column, $return);
             });
 
+        //合计
+        $total = $this->countTotal($return, $header_default);
+        //填充合计
+        $this->fillTotalData($total, $header_default, $return);
+
         return $this->saveExportData($return,$header);
     }
 

app/Service/GiveOutService.php

@@ -126,6 +126,8 @@ class GiveOutService extends Service
         $list = $this->limit($model,'',$data);
         $list = $this->fillData($list);
 
+        $list['count'] = $this->countTotal($list['data'], $user['header_default']);
+
         return [true, $list];
     }