From fd290b7ac3821bd2c3f7e1549c4af14ce3137be1 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 05 十二月 2025 09:33:16 +0800
Subject: [PATCH] 班组产量报表导出格式调整
---
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
index 6c745c4..f659512 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
@@ -28,6 +28,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
@@ -985,10 +986,25 @@
date.add(endDate);
List<Delivery> deliveryList = deliveryMapper.selectByDate(startDate, endDate);
+ Integer quantity = 0;
+ Double area = 0.00;
+ Double money = 0.00;
+ for(Delivery delivery:deliveryList){
+ quantity += Integer.parseInt(String.valueOf(delivery.getQuantity()));
+ area += Double.parseDouble(String.valueOf(delivery.getArea()));
+ money += delivery.getMoney();
+ }
+ Map<String, Object> totalSum = new HashMap<>();
+ DecimalFormat df = new DecimalFormat("#.00");
+ totalSum.put("quantity",quantity);
+ totalSum.put("area", df.format(area));
+ totalSum.put("perimeter", df.format(money));
+ totalSum.put("count", deliveryList.size());
+
Map<String,Object> map = new HashMap<>();
map.put("data",deliveryList);
map.put("date",date);
-
+ map.put("totalSum",totalSum);
return map;
}
}
--
Gitblit v1.8.0