胡庆余堂

app/Service/ExportFileService.php

@@ -236,7 +236,7 @@ class ExportFileService extends Service
             // 这里调用你的填充逻辑
             $dayResult = $service->statisticsEmployeeFillExportData($dayRows, [$dayTimestamp], 1, $employee, $item_total);
             // 格式化并存入结果集
-            $finalExportData[date('Y.m.d',$dayTimestamp) . '合计'] = $this->formatSheetData($header, $column, $dayResult);
+            $finalExportData[date('Y.m.d',$dayTimestamp)] = $this->formatSheetData($header, $column, $dayResult);
         }
 
         // 3. 调用保存方法
@@ -290,7 +290,7 @@ class ExportFileService extends Service
             // 这里调用你的填充逻辑
             $dayResult = $service->statisticsDeviceFillExportData($dayRows, [$dayTimestamp], $device, $item_total);
             // 格式化并存入结果集
-            $finalExportData[date('Y.m.d',$dayTimestamp) . '合计'] = $this->formatSheetData($header, $column, $dayResult);
+            $finalExportData[date('Y.m.d',$dayTimestamp)] = $this->formatSheetData($header, $column, $dayResult);
         }
 
         // 3. 调用保存方法

app/Service/TableHeadService.php

@@ -105,7 +105,7 @@ class TableHeadService extends Service
     public function extra_73(&$data){
         $item_total = Item::where('del_time',0)
             ->where('is_use', 1)
-            ->orderBy('id','desc')
+            ->orderBy('code','asc')
             ->pluck('code','id')->toArray();
 
         foreach ($item_total as $key => $value){
@@ -119,7 +119,7 @@ class TableHeadService extends Service
     public function extra_74(&$data){
         $item_total = Item::where('del_time',0)
             ->where('is_use', 1)
-            ->orderBy('id','desc')
+            ->orderBy('code','asc')
             ->pluck('code','id')->toArray();
 
         foreach ($item_total as $key => $value){