From 56a7e539628f35d350532e8afcb51e39d9cd0cf9 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 11 十月 2024 11:31:10 +0800
Subject: [PATCH] fix:补充花农报表
---
src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java b/src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java
index 6b30c09..3d6bcd6 100644
--- a/src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java
+++ b/src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java
@@ -18,6 +18,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import javax.servlet.http.HttpServletResponse;
@@ -292,25 +293,27 @@
List<OrderSupplierReportResultVO> list = orderReportMapper.getOrderSupplierReport(supplierReportCalendarBO);
String[] rowsName = new String[]{"序号","日期", "供应商ID", "供应商","花农底价"
- , "降级扣款", "缺货扣款（缺货+补货）","售后扣花农款","售后扣合伙人款","实际销售扎数","结算费用","订单状态"};
+ , "降级扣款", "缺货扣款（缺货+补货）","售后扣花农款","实际销售扎数","结算费用","订单状态"};
List<Object[]> dataList = new ArrayList<>();
int sn = 1;
for (OrderSupplierReportResultVO o : list) {
- Object[] objs = new Object[rowsName.length];
- int a = 0;
- objs[a++] = sn; // 序号
- objs[a++] = format(o.getOrderDate(), "yyyy-MM-dd"); // 日期
- objs[a++] = o.getSupplierId(); // 供应商ID
- objs[a++] = o.getSupplierName(); // 供应商
- objs[a++] = o.getOrderSupplierPriceAmount(); // 花农底价
- objs[a++] = o.getOrderCheckFee(); //降级扣款
- objs[a++] = o.getOrderLackFeeSupplier();//缺货扣款
- objs[a++] = o.getSalesFeeSupplier(); // 售后扣花农款
- objs[a++] = o.getRealSaleNum(); // 实际销售扎数
- objs[a++] = o.getProfitFeeAmount(); // 结算费用
- objs[a++] = o.getSettleStatus(); // 订单状态
- dataList.add(objs);
- sn++;
+ if(!ObjectUtils.isEmpty(o)) {
+ Object[] objs = new Object[rowsName.length];
+ int a = 0;
+ objs[a++] = sn; // 序号
+ objs[a++] = format(o.getDateinfo(), "yyyy-MM-dd"); // 日期
+ objs[a++] = o.getSupplierId(); // 供应商ID
+ objs[a++] = o.getSupplierName(); // 供应商
+ objs[a++] = o.getOrderSupplierPriceAmount(); // 花农底价
+ objs[a++] = o.getOrderCheckFee(); //降级扣款
+ objs[a++] = o.getOrderLackFeeSupplier();//缺货扣款
+ objs[a++] = o.getSalesFeeSupplier(); // 售后扣花农款
+ objs[a++] = o.getRealSaleNum(); // 实际销售扎数
+ objs[a++] = o.getProfitFeeAmount(); // 结算费用
+ objs[a++] = o.getSettleStatus(); // 订单状态
+ dataList.add(objs);
+ sn++;
+ }
}
ExcelExportUtil excelExportUtil = new ExcelExportUtil("花农结算报表", rowsName, dataList, response);
--
Gitblit v1.9.3