From 2c706a5d58e8315980ea92d6b82e0e4959bad8ca Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 11 十二月 2023 17:44:40 +0800
Subject: [PATCH] 1.修改单据导出 2.修改物品信息导入
---
consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java
index 9c6a5da..4bb8dbd 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java
@@ -155,7 +155,7 @@
@ApiOperation(value = "瀵煎嚭鎶ュ簾鍗�", notes = "瀵煎嚭鎶ュ簾鍗�")
@ApiImplicitParams({@ApiImplicitParam(name = "id", value = "鎶ュ簾鍗昳d", dataType = "Long", paramType = "query")})
@GetMapping("/list/export")
- public void export(Long id, HttpServletResponse response) throws Exception {
+ public String export(Long id, HttpServletResponse response) throws Exception {
if (id == null) {
throw new RuntimeException("鎶ュ簾鍗昳d涓虹┖");
}
@@ -175,8 +175,8 @@
int countNum =
export.stream().filter(item -> item.getNum() != null).mapToInt(ScrappedInfoExcelTemplate::getNum).sum();
- int totalAmount = export.stream().filter(item -> item.getTotalAmount() != null)
- .mapToInt(ScrappedInfoExcelTemplate::getTotalAmount).sum();
+ double totalAmount = export.stream().filter(item -> item.getTotalAmount() != null)
+ .mapToDouble(ScrappedInfoExcelTemplate::getAmount).sum();
Map<String, Object> map = new HashMap<>();
map.put("code", businessFormCode);
@@ -186,7 +186,7 @@
map.put("totalAmount", totalAmount);
Workbook sheets = ExcelExportUtil.exportExcel(exportParams, ScrappedInfoExcelTemplate.class, export, map);
- downLoadExcel("鎶ュ簾鐧昏鍗�", response, sheets);
+ return downLoadExcel("鎶ュ簾鐧昏鍗�", response, sheets);
}
--
Gitblit v1.9.1