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/pojo/excel/ProcureExcelTemplate.java | 7 ++++---
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 2 +-
consum-base/src/main/java/com/consum/base/pojo/excel/OutputExcelTemplate.java | 5 +++--
consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java | 2 +-
consum-base/src/main/java/com/consum/base/core/utils/CurrencyUtil.java | 16 +++++++++-------
consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java | 2 +-
consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java | 2 +-
consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java | 2 +-
consum-base/src/main/java/com/consum/base/pojo/excel/TransferExcelTemplate.java | 5 +++--
consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java | 2 +-
10 files changed, 25 insertions(+), 20 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 9c9640c..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
@@ -229,7 +229,7 @@
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();
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
index d9bc273..1984a5b 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
@@ -440,7 +440,7 @@
}
int countNum = exportList.stream().filter(item -> item.getNum() != null).mapToInt(ProcureExcelTemplate::getNum).sum();
- int totalAmount = exportList.stream().filter(export -> export.getTotalAmount() != null).mapToInt(ProcureExcelTemplate::getTotalAmount).sum();
+ double totalAmount = exportList.stream().filter(export -> export.getTotalAmount() != null).mapToDouble(ProcureExcelTemplate::getAmount).sum();
Optional<ProcureExcelTemplate> first = exportList.stream().findFirst();
ProcureExcelTemplate templateExcelExport = first.get();
String businessFormCode = templateExcelExport.getBusinessFormCode();
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
index f78775b..8659f28 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -321,7 +321,7 @@
List<TransferExcelTemplate> export = this.lWhFormTransferService.export(id, type);
int countNum = export.stream().filter(item -> item.getNum() != null).mapToInt(TransferExcelTemplate::getNum).sum();
- int totalAmount = export.stream().filter(item -> item.getTotalAmount() != null).mapToInt(TransferExcelTemplate::getTotalAmount).sum();
+ double totalAmount = export.stream().filter(item -> item.getTotalAmount() != null).mapToDouble(TransferExcelTemplate::getAmount).sum();
Optional<TransferExcelTemplate> first = export.stream().findFirst();
TransferExcelTemplate entity = first.get();
String businessFormCode = entity.getBusinessFormCode();
diff --git a/consum-base/src/main/java/com/consum/base/core/utils/CurrencyUtil.java b/consum-base/src/main/java/com/consum/base/core/utils/CurrencyUtil.java
index 3c56920..091ba0b 100644
--- a/consum-base/src/main/java/com/consum/base/core/utils/CurrencyUtil.java
+++ b/consum-base/src/main/java/com/consum/base/core/utils/CurrencyUtil.java
@@ -8,20 +8,22 @@
public class CurrencyUtil {
public static BigDecimal convertFenToYuan(long price) {
- return new BigDecimal(price).divide(new BigDecimal(100));
+ return new BigDecimal(price).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_DOWN);
}
- public static Integer convertFenToYuan(Integer price) {
+
+ public static double convertFenToYuan(Integer price) {
if (price == null) {
- return null;
+ return 0;
}
- return new BigDecimal(price).divide(new BigDecimal(100)).intValueExact();
+ return new BigDecimal(price).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_DOWN).doubleValue();
}
- public static BigDecimal convertFenToYuan(BigDecimal price) {
+
+ public static double convertFenToYuan(Double price) {
if (price == null) {
- return null;
+ return 0;
}
- return price.divide(new BigDecimal(100));
+ return new BigDecimal(price).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_DOWN).doubleValue();
}
}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/excel/OutputExcelTemplate.java b/consum-base/src/main/java/com/consum/base/pojo/excel/OutputExcelTemplate.java
index 8ba8109..72003d6 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/excel/OutputExcelTemplate.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/excel/OutputExcelTemplate.java
@@ -25,11 +25,12 @@
@Excel(name = "鍗曚环")
private Integer price;
@Excel(name = "閲戦")
- private Integer totalAmount;
+ private Double amount;
@Excel(name = "澶囨敞")
private String remark;
-
+ @ExcelIgnore
+ private Integer totalAmount;
@ExcelIgnore
private String businessFormCode;
@ExcelIgnore
diff --git a/consum-base/src/main/java/com/consum/base/pojo/excel/ProcureExcelTemplate.java b/consum-base/src/main/java/com/consum/base/pojo/excel/ProcureExcelTemplate.java
index 007f831..30fecd7 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/excel/ProcureExcelTemplate.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/excel/ProcureExcelTemplate.java
@@ -23,15 +23,16 @@
@Excel(name = "鏁伴噺")
private Integer num;
@Excel(name = "鍗曚环")
- private Integer price;
+ private Double price;
@Excel(name = "閲戦")
- private Integer totalAmount;
+ private Double amount;
@Excel(name = "瀛樻斁鍦扮偣")
private String warehouseName;
@Excel(name = "澶囨敞")
private String remark;
-
+ @ExcelIgnore
+ private Integer totalAmount;
@ExcelIgnore
private String businessFormCode;
@ExcelIgnore
diff --git a/consum-base/src/main/java/com/consum/base/pojo/excel/TransferExcelTemplate.java b/consum-base/src/main/java/com/consum/base/pojo/excel/TransferExcelTemplate.java
index 59ee5bd..fb7a1b0 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/excel/TransferExcelTemplate.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/excel/TransferExcelTemplate.java
@@ -23,11 +23,12 @@
@Excel(name = "鏁伴噺")
private Integer num;
@Excel(name = "閲戦")
- private Integer totalAmount;
+ private double amount;
@Excel(name = "澶囨敞")
private String remark;
-
+ @ExcelIgnore
+ private Integer totalAmount;
@ExcelIgnore
private String businessFormCode;
@ExcelIgnore
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
index 14b247b..8978da5 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
@@ -258,7 +258,7 @@
List<OutputExcelTemplate> list = Lists.newArrayList();
select.forEach(item -> {
OutputExcelTemplate templateExcelExport = MapUtils.convertMapToObj(item, OutputExcelTemplate.class);
- templateExcelExport.setTotalAmount(CurrencyUtil.convertFenToYuan(templateExcelExport.getTotalAmount()));
+ templateExcelExport.setAmount(CurrencyUtil.convertFenToYuan(templateExcelExport.getTotalAmount()));
list.add(templateExcelExport);
});
return list;
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java
index a84f859..d66808e 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java
@@ -149,7 +149,7 @@
List<ProcureExcelTemplate> list = Lists.newArrayList();
select.forEach(item -> {
ProcureExcelTemplate templateExcelExport = MapUtils.convertMapToObj(item, ProcureExcelTemplate.class);
- templateExcelExport.setTotalAmount(CurrencyUtil.convertFenToYuan(templateExcelExport.getTotalAmount()));
+ templateExcelExport.setAmount(CurrencyUtil.convertFenToYuan(templateExcelExport.getTotalAmount()));
templateExcelExport.setPrice(CurrencyUtil.convertFenToYuan(templateExcelExport.getPrice()));
list.add(templateExcelExport);
});
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
index 7607610..3484855 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
@@ -443,7 +443,7 @@
} else {
templateExcelTransfer.setTenantName(templateExcelTransfer.getInAgencyName());
}
- templateExcelTransfer.setTotalAmount(CurrencyUtil.convertFenToYuan(templateExcelTransfer.getTotalAmount()));
+ templateExcelTransfer.setAmount(CurrencyUtil.convertFenToYuan(templateExcelTransfer.getTotalAmount()));
list.add(templateExcelTransfer);
});
--
Gitblit v1.9.1