有盛每日报表

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/WaybillOrderReportRespExcelVO.java

@@ -2,6 +2,7 @@ package com.sckw.transport.model.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.excel.annotation.ExcelContext;
 import lombok.Data;
 
 import java.io.Serial;
@@ -16,6 +17,7 @@ import java.util.Date;
  * @create :2025-11-11 20:16:00
  */
 @Data
+@ExcelContext(fileName = "每日报表", sheetName = "报表台账")
 public class WaybillOrderReportRespExcelVO implements Serializable {
 
     @Serial

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/WaybillOrderService.java

@@ -2022,14 +2022,12 @@ public class WaybillOrderService {
             }
 
             WaybillOrderReportResp firstItem = details.get(0);
+            // A. 添加【明细行】 ---
+            resultList.addAll(details);
 
-            // A. 创建并添加【汇总行】 ---
+            // B. 创建并添加【汇总行】 ---
             WaybillOrderReportResp summaryRow = createSummaryRow(firstItem, details);
             resultList.add(summaryRow);
-
-            // B. 添加【明细行】 ---
-            // 此时 details 已经是排好序的了，直接追加即可
-            resultList.addAll(details);
         }
         log.info("[报表]分组汇总结束!");
         return resultList;