From 6bf8b48e9d689ab90864bc2ee0e6ebeae3a4c1fa Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 04 八月 2022 10:06:47 +0800
Subject: [PATCH] 1.优化报表缴费明细统计问题2、优化调查问卷投票问题3、优化投诉咨询问题3、优化业主新增用户联系地址4、增加定时任务根据身份证号自动更新年龄5、优化缴费清单
---
service-report/src/main/java/com/java110/report/bmo/reportFeeMonthStatistics/impl/GetReportFeeMonthStatisticsBMOImpl.java | 44 +++++++++++++++++++++++++++++++++-----------
1 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/bmo/reportFeeMonthStatistics/impl/GetReportFeeMonthStatisticsBMOImpl.java b/service-report/src/main/java/com/java110/report/bmo/reportFeeMonthStatistics/impl/GetReportFeeMonthStatisticsBMOImpl.java
index 4317186..8440ddd 100755
--- a/service-report/src/main/java/com/java110/report/bmo/reportFeeMonthStatistics/impl/GetReportFeeMonthStatisticsBMOImpl.java
+++ b/service-report/src/main/java/com/java110/report/bmo/reportFeeMonthStatistics/impl/GetReportFeeMonthStatisticsBMOImpl.java
@@ -426,6 +426,8 @@
Double allVacantHousingDiscount = 0.0;
//绌虹疆鎴垮噺鍏�(澶ц)
Double allVacantHousingReduction = 0.0;
+ //璧犻�侀噾棰�(澶ц)
+ Double allGiftAmount = 0.0;
//鍚村鏂� 娉ㄩ噴 鎰熻鍜屼笂闈㈢殑369 鍔熻兘閲嶅
//int size = 0;
if (count > 0) {
@@ -468,6 +470,10 @@
if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType()) && reportFeeMonthStatistics.getDiscountSmallType().equals("5")) {
allVacantHousingReduction = Double.valueOf(discountPrice);
}
+ //璧犻�侀噾棰�(澶ц)
+ if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType()) && reportFeeMonthStatistics.getDiscountSmallType().equals("6")) {
+ allGiftAmount = Double.valueOf(discountPrice);
+ }
}
//搴旀敹鎬婚噾棰�(灏忚)
Double totalReceivableAmount = 0.0;
@@ -481,6 +487,8 @@
Double totalVacantHousingDiscount = 0.0;
//绌虹疆鎴垮噺鍏嶉噾棰�(灏忚)
Double totalVacantHousingReduction = 0.0;
+ //璧犻�侀噾棰�(灏忚)
+ Double totalGiftAmount = 0.0;
//婊炵撼閲�(灏忚)
Double totalLateFee = 0.0;
List<String> ownerIds = new ArrayList<>();
@@ -526,7 +534,7 @@
//婊炵撼閲�
if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType()) && reportFeeMonthStatistics.getDiscountSmallType().equals("3")) {
//鑾峰彇婊炵撼閲戦噾棰�
- Double discountPrice = (Double.valueOf(reportFeeMonthStatistics.getDiscountPrice())) * (-1);
+ Double discountPrice = (Double.valueOf(reportFeeMonthStatistics.getDiscountPrice()));
totalLateFee = totalLateFee + discountPrice;
//婊炵撼閲�
reportFeeMonthStatistics.setLateFee(reportFeeMonthStatistics.getDiscountPrice());
@@ -552,6 +560,16 @@
reportFeeMonthStatistics.setVacantHousingReduction(reportFeeMonthStatistics.getDiscountPrice());
} else {
reportFeeMonthStatistics.setVacantHousingReduction("0");
+ }
+ //璧犻�侀噾棰�
+ if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType()) && reportFeeMonthStatistics.getDiscountSmallType().equals("6")) {
+ //璧犻�侀噾棰�
+ Double discountPrice = Double.valueOf(reportFeeMonthStatistics.getDiscountPrice());
+ totalGiftAmount = totalGiftAmount + discountPrice;
+ //璧犻�侀噾棰�
+ reportFeeMonthStatistics.setGiftAmount(reportFeeMonthStatistics.getDiscountPrice());
+ } else {
+ reportFeeMonthStatistics.setGiftAmount("0");
}
if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(reportFeeMonthStatistics.getPayerObjType())) {
reportFeeMonthStatistics.setObjName(reportFeeMonthStatistics.getFloorNum()
@@ -641,29 +659,33 @@
//瀹炴敹閲戦(灏忚)
reportFeeMonthStatisticsTotalDto.setTotalReceivedAmount(String.format("%.2f", totalReceivedAmount));
//浼樻儬閲戦(灏忚)
- reportFeeMonthStatisticsTotalDto.setTotalPreferentialAmount(String.valueOf(totalPreferentialAmount));
+ reportFeeMonthStatisticsTotalDto.setTotalPreferentialAmount(String.format("%.2f",totalPreferentialAmount));
//鍑忓厤閲戦(灏忚)
- reportFeeMonthStatisticsTotalDto.setTotalDeductionAmount(String.valueOf(totalDeductionAmount));
+ reportFeeMonthStatisticsTotalDto.setTotalDeductionAmount(String.format("%.2f",totalDeductionAmount));
//婊炵撼閲�(灏忚)
- reportFeeMonthStatisticsTotalDto.setTotalLateFee(String.valueOf(totalLateFee));
+ reportFeeMonthStatisticsTotalDto.setTotalLateFee(String.format("%.2f",totalLateFee));
//绌虹疆鎴挎墦鎶�(灏忚)
- reportFeeMonthStatisticsTotalDto.setTotalVacantHousingDiscount(String.valueOf(totalVacantHousingDiscount));
+ reportFeeMonthStatisticsTotalDto.setTotalVacantHousingDiscount(String.format("%.2f",totalVacantHousingDiscount));
//绌虹疆鎴垮噺鍏�(灏忚)
- reportFeeMonthStatisticsTotalDto.setTotalVacantHousingReduction(String.valueOf(totalVacantHousingReduction));
+ reportFeeMonthStatisticsTotalDto.setTotalVacantHousingReduction(String.format("%.2f",totalVacantHousingReduction));
+ //璧犻�佽鍒欓噾棰�(灏忚)
+ reportFeeMonthStatisticsTotalDto.setTotalGiftAmount(String.format("%.2f",totalGiftAmount));
//搴旀敹閲戦(澶ц)
reportFeeMonthStatisticsTotalDto.setAllReceivableAmount(String.format("%.2f", allReceivableAmount));
//瀹炴敹閲戦(澶ц)
reportFeeMonthStatisticsTotalDto.setAllReceivedAmount(String.format("%.2f", allReceivedAmount));
//浼樻儬閲戦(澶ц)
- reportFeeMonthStatisticsTotalDto.setAllPreferentialAmount(String.valueOf(allPreferentialAmount));
+ reportFeeMonthStatisticsTotalDto.setAllPreferentialAmount(String.format("%.2f",allPreferentialAmount));
//鍑忓厤閲戦(澶ц)
- reportFeeMonthStatisticsTotalDto.setAllDeductionAmount(String.valueOf(allDeductionAmount));
+ reportFeeMonthStatisticsTotalDto.setAllDeductionAmount(String.format("%.2f",allDeductionAmount));
//婊炵撼閲�(澶ц)
- reportFeeMonthStatisticsTotalDto.setAllLateFee(String.valueOf(allLateFee));
+ reportFeeMonthStatisticsTotalDto.setAllLateFee(String.format("%.2f",allLateFee));
//绌虹疆鎴挎墦鎶橀噾棰�(澶ц)
- reportFeeMonthStatisticsTotalDto.setAllVacantHousingDiscount(String.valueOf(allVacantHousingDiscount));
+ reportFeeMonthStatisticsTotalDto.setAllVacantHousingDiscount(String.format("%.2f",allVacantHousingDiscount));
//绌虹疆鎴垮噺鍏嶉噾棰�(澶ц)
- reportFeeMonthStatisticsTotalDto.setAllVacantHousingReduction(String.valueOf(allVacantHousingReduction));
+ reportFeeMonthStatisticsTotalDto.setAllVacantHousingReduction(String.format("%.2f",allVacantHousingReduction));
+ //璧犻�佽鍒欓噾棰�(澶ц)
+ reportFeeMonthStatisticsTotalDto.setAllGiftAmount(String.format("%.2f",allGiftAmount));
} else {
reportFeeMonthStatisticsDtos = new ArrayList<>();
reportList.addAll(reportFeeMonthStatisticsDtos);
--
Gitblit v1.8.0