From 7c40b902af2ae09b353525f913056d66af12caf1 Mon Sep 17 00:00:00 2001 From: cy <1664593601@qq.com> Date: 星期六, 09 十二月 2023 17:02:43 +0800 Subject: [PATCH] feat: 1.新增人员机构错误 2.修改使用人时设置可用数量 3.重复预警 4.部门物品退回时设置调拨单信息 5.统计报表删除一列 --- consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java | 4 ++-- 1 files changed, 2 insertions(+), 2 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..125fb25 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 @@ -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); -- Gitblit v1.9.1