From 04245ab8ecc50295563dae540477c8a9c11a1a21 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 23 十二月 2024 18:17:02 +0800
Subject: [PATCH] 1.行政区划-修改：上东-济南：济阳区，章丘区，莱芜区，钢城区
---
src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 3ef65aa..a43f482 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
@@ -360,7 +360,8 @@
List<OrderSupplierReportResultVO> list = orderReportMapper.getOrderSupplierReport(supplierReportCalendarBO);
String[] rowsName = new String[]{"序号","日期", "供应商ID", "供应商","花农底价"
- , "降级扣款", "缺货扣款（缺货+补货）","售后扣花农款","实际销售扎数","结算费用","订单状态"};
+ , "降级扣款", "缺货扣款（缺货+补货）","售后扣花农款",
+ "总销售扎数","实际销售扎数","缺货扎数","降级扎数","补货扎数","结算费用","订单状态"};
List<Object[]> dataList = new ArrayList<>();
int sn = 1;
for (OrderSupplierReportResultVO o : list) {
@@ -375,7 +376,13 @@
objs[a++] = o.getOrderCheckFee(); //降级扣款
objs[a++] = o.getOrderLackFeeSupplier();//缺货扣款
objs[a++] = o.getSalesFeeSupplier(); // 售后扣花农款
+
+ objs[a++] = o.getOrderNum(); // 总销售扎数
objs[a++] = o.getRealSaleNum(); // 实际销售扎数
+ objs[a++] = o.getOrderLackNum(); // 缺货扎数
+ objs[a++] = o.getOrderReduceNum(); // 降级扎数
+ objs[a++] = o.getOrderReplaceNum(); // 补货扎数
+
objs[a++] = o.getProfitFeeAmount(); // 结算费用
objs[a++] = o.getSettleStatus(); // 订单状态
dataList.add(objs);
--
Gitblit v1.9.3