From 43a322430e7e6dcea64242bec6918037da160986 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 04 十二月 2023 10:50:23 +0800
Subject: [PATCH] 分转元

---
 consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
index c025739..5ff38e9 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
@@ -215,7 +215,7 @@
         if (sysInfo == null) {
             throw new RuntimeException("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
         }
-        ClassPathResource classPathResource = new ClassPathResource("import/閲囪喘閫�璐у崟.xls");
+        ClassPathResource classPathResource = new ClassPathResource("import/鍑哄簱鍗�.xls");
         // 鑾峰彇鏂囦欢杈撳叆娴�
         InputStream inputStream = classPathResource.getInputStream();
         Workbook wb = new HSSFWorkbook(inputStream);
@@ -224,11 +224,12 @@
         params.setHeadingStartRow(2);
 
         List<OutputExcelTemplate> exportList = lWhFormOutputService.getExportList(id);
+
         if (CollectionUtils.isEmpty(exportList)) {
             throw new RuntimeException("鏁版嵁涓虹┖");
         }
         int countNum = exportList.stream().filter(item -> item.getNum() != null).mapToInt(OutputExcelTemplate::getNum).sum();
-        int totalAmount = exportList.stream().filter(item -> item.getTotalAmount() != null).mapToInt(OutputExcelTemplate::getTotalAmount).sum();
+        double totalAmount = exportList.stream().filter(item -> item.getTotalAmount() != null).mapToDouble(OutputExcelTemplate::getAmount).sum();
         Optional<OutputExcelTemplate> first = exportList.stream().findFirst();
         OutputExcelTemplate templateExcelExport = first.get();
         String businessFormCode = templateExcelExport.getBusinessFormCode();
@@ -243,7 +244,7 @@
         map.put("totalAmount", totalAmount);
 
         Workbook workbook = ExcelExportUtil.exportExcel(params, OutputExcelTemplate.class, exportList, map);
-        downLoadExcel("閲囪喘閫�璐у崟", response, workbook);
+        downLoadExcel("鍑哄簱鍗�", response, workbook);
 
     }
 

--
Gitblit v1.9.1