From 17bfc74d3531f606034bd70ecc33ce97cb81e17f Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 26 二月 2024 01:20:44 +0800
Subject: [PATCH] 优化代码
---
service-report/src/main/java/com/java110/report/smo/impl/QueryPayFeeDetailInnerServiceSMOImpl.java | 416 ++++++++++++++++++----------------------------------------
1 files changed, 130 insertions(+), 286 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/smo/impl/QueryPayFeeDetailInnerServiceSMOImpl.java b/service-report/src/main/java/com/java110/report/smo/impl/QueryPayFeeDetailInnerServiceSMOImpl.java
index 818a650..443c4d6 100644
--- a/service-report/src/main/java/com/java110/report/smo/impl/QueryPayFeeDetailInnerServiceSMOImpl.java
+++ b/service-report/src/main/java/com/java110/report/smo/impl/QueryPayFeeDetailInnerServiceSMOImpl.java
@@ -6,20 +6,26 @@
import com.java110.dto.ReportFeeMonthStatisticsPrepaymentDto.ReportFeeMonthStatisticsPrepaymentTotalDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
+import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.dto.repair.RepairDto;
import com.java110.dto.reportFee.ReportFeeMonthStatisticsDto;
import com.java110.dto.reportFee.ReportFeeMonthStatisticsTotalDto;
+import com.java110.dto.room.RoomDto;
+import com.java110.intf.community.IParkingSpaceV1InnerServiceSMO;
import com.java110.intf.community.IRepairInnerServiceSMO;
+import com.java110.intf.community.IRoomV1InnerServiceSMO;
import com.java110.intf.fee.IFeeDetailInnerServiceSMO;
import com.java110.intf.report.IQueryPayFeeDetailInnerServiceSMO;
import com.java110.intf.report.IReportFeeMonthStatisticsInnerServiceSMO;
import com.java110.intf.report.IReportFeeMonthStatisticsPrepaymentInnerServiceSMO;
+import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.intf.user.IOwnerInnerServiceSMO;
import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.ListUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +33,7 @@
import org.springframework.web.bind.annotation.RestController;
import java.lang.reflect.Field;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@@ -56,304 +63,141 @@
@Autowired
private IFeeDetailInnerServiceSMO feeDetailInnerServiceSMOImpl;
+ @Autowired
+ private IRoomV1InnerServiceSMO roomV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
+
+ /**
+ * 鏌ヨ缂磋垂鏄庣粏
+ *
+ * @param reportFeeMonthStatisticsDto
+ * @return
+ */
@Override
public ResultVo query(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto) {
+
JSONObject countInfo = reportFeeMonthStatisticsInnerServiceSMOImpl.queryPayFeeDetailCount(reportFeeMonthStatisticsDto);
-
int count = Integer.parseInt(countInfo.get("count").toString());
-
List<ReportFeeMonthStatisticsDto> reportFeeMonthStatisticsDtos = null;
ReportFeeMonthStatisticsTotalDto reportFeeMonthStatisticsTotalDto = new ReportFeeMonthStatisticsTotalDto();
- List<ReportFeeMonthStatisticsDto> reportList = new ArrayList<>();
- //搴旀敹鎬婚噾棰�(澶ц)
- Double allReceivableAmount = 0.0;
- //瀹炴敹閲戦(澶ц)
- Double allReceivedAmount = 0.0;
- //浼樻儬閲戦(澶ц)
- Double allPreferentialAmount = 0.0;
- //鍑忓厤閲戦(澶ц)
- Double allDeductionAmount = 0.0;
- //婊炵撼閲�(澶ц)
- Double allLateFee = 0.0;
- //绌虹疆鎴挎墦鎶�(澶ц)
- Double allVacantHousingDiscount = 0.0;
- //绌虹疆鎴垮噺鍏�(澶ц)
- Double allVacantHousingReduction = 0.0;
- //璧犻�侀噾棰�(澶ц)
- Double allGiftAmount = 0.0;
- //鍚村鏂� 娉ㄩ噴 鎰熻鍜屼笂闈㈢殑369 鍔熻兘閲嶅
- //int size = 0;
- if (count > 0) {
- //鏌ヨ缂磋垂鏄庣粏
- reportFeeMonthStatisticsDtos = reportFeeMonthStatisticsInnerServiceSMOImpl.queryPayFeeDetail(reportFeeMonthStatisticsDto);
- //鏌ヨ搴旀敹銆佸疄鏀舵�婚噾棰�(澶ц)
- List<ReportFeeMonthStatisticsDto> reportFeeMonthStatisticsList = reportFeeMonthStatisticsInnerServiceSMOImpl.queryAllPayFeeDetail(reportFeeMonthStatisticsDto);
- //鏌ヨ(浼樻儬銆佸噺鍏嶃�佹粸绾抽噾銆佺┖缃埧鎵撴姌銆佺┖缃埧鍑忓厤閲戦绛�)澶ц鎬婚噾棰�
- List<ReportFeeMonthStatisticsDto> reportFeeMonthStatisticsSum = reportFeeMonthStatisticsInnerServiceSMOImpl.queryPayFeeDetailSum(reportFeeMonthStatisticsDto);
- allReceivableAmount = Double.valueOf(reportFeeMonthStatisticsList.get(0).getAllReceivableAmount());
- allReceivedAmount = Double.valueOf(reportFeeMonthStatisticsList.get(0).getAllReceivedAmount());
- for (ReportFeeMonthStatisticsDto reportFeeMonthStatistics : reportFeeMonthStatisticsSum) {
- //杩欓噷鏄煡璇㈠嚭鐨勯噾棰濇�诲拰
- String discountPrice = reportFeeMonthStatistics.getDiscountPrice();
- //浼樻儬閲戦(澶ц)
- if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType()) && reportFeeMonthStatistics.getDiscountSmallType().equals("1")) {
-// allPreferentialAmount = Double.valueOf(discountPrice);
- Double aDouble = Double.valueOf(discountPrice);
- allPreferentialAmount = allPreferentialAmount + aDouble;
- }
- //鍑忓厤閲戦(澶ц)
- if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType()) && reportFeeMonthStatistics.getDiscountSmallType().equals("2")) {
- //allDeductionAmount = Double.valueOf(discountPrice);
- Double aDouble = Double.valueOf(discountPrice);
- allDeductionAmount = allDeductionAmount + aDouble;
- }
- //婊炵撼閲�(澶ц)
- if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType()) && reportFeeMonthStatistics.getDiscountSmallType().equals("3")) {
-// allLateFee = Double.valueOf(discountPrice);
- Double aDouble = Double.valueOf(discountPrice);
- allLateFee = allLateFee + aDouble;
- }
- //绌虹疆鎴挎墦鎶橀噾棰�(澶ц)
- if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType()) && reportFeeMonthStatistics.getDiscountSmallType().equals("4")) {
-// allVacantHousingDiscount = Double.valueOf(discountPrice);
- Double aDouble = Double.valueOf(discountPrice);
- allVacantHousingDiscount = allVacantHousingDiscount + aDouble;
- }
- //绌虹疆鎴垮噺鍏嶉噾棰�(澶ц)
- if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType()) && reportFeeMonthStatistics.getDiscountSmallType().equals("5")) {
-// allVacantHousingReduction = Double.valueOf(discountPrice);
- Double aDouble = Double.valueOf(discountPrice);
- allVacantHousingReduction = allVacantHousingReduction + aDouble;
- }
- //璧犻�侀噾棰�(澶ц)
- if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType()) && reportFeeMonthStatistics.getDiscountSmallType().equals("6")) {
-// allGiftAmount = Double.valueOf(discountPrice);
- Double aDouble = Double.valueOf(discountPrice);
- allGiftAmount = allGiftAmount + aDouble;
- }
- }
- //搴旀敹鎬婚噾棰�(灏忚)
- Double totalReceivableAmount = 0.0;
- //瀹炴敹鎬婚噾棰�(灏忚)
- Double totalReceivedAmount = 0.0;
- //浼樻儬閲戦(灏忚)
- Double totalPreferentialAmount = 0.0;
- //鍑忓厤閲戦(灏忚)
- Double totalDeductionAmount = 0.0;
- //绌虹疆鎴挎墦鎶橀噾棰�(灏忚)
- Double totalVacantHousingDiscount = 0.0;
- //绌虹疆鎴垮噺鍏嶉噾棰�(灏忚)
- Double totalVacantHousingReduction = 0.0;
- //璧犻�侀噾棰�(灏忚)
- Double totalGiftAmount = 0.0;
- //婊炵撼閲�(灏忚)
- Double totalLateFee = 0.0;
- List<String> ownerIds = new ArrayList<>();
- for (ReportFeeMonthStatisticsDto reportFeeMonthStatistics : reportFeeMonthStatisticsDtos) {
- //搴旀敹閲戦
- Double receivableAmount = Double.valueOf(reportFeeMonthStatistics.getReceivableAmount());
- //瀹炴敹閲戦
- Double receivedAmount = Double.valueOf(reportFeeMonthStatistics.getReceivedAmount());
- totalReceivableAmount = totalReceivableAmount + receivableAmount;
- totalReceivedAmount = totalReceivedAmount + receivedAmount;
-
- if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(reportFeeMonthStatistics.getPayerObjType())) {
- ownerIds.add(reportFeeMonthStatistics.getOwnerId());
- }
-
- // 鏈�澶ц褰曟椂 灏卞幓鍒锋柊
- //濡傛灉鏄溅浣嶅埛鎴垮眿淇℃伅
- if (ownerIds.size() == MAX_ROWS) {
- refreshReportFeeMonthStatistics(ownerIds, reportFeeMonthStatisticsDtos);
- ownerIds = new ArrayList<>();
- }
-
- //浼樻儬閲戦
- if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallTypeOne()) && reportFeeMonthStatistics.getDiscountSmallTypeOne().equals("1")) {
- //鑾峰彇浼樻儬閲戦
- Double discountPrice = Double.valueOf(reportFeeMonthStatistics.getDiscountPriceOne());
- totalPreferentialAmount = totalPreferentialAmount + discountPrice;
- //浼樻儬閲戦
- reportFeeMonthStatistics.setPreferentialAmount(reportFeeMonthStatistics.getDiscountPriceOne());
- } else {
- reportFeeMonthStatistics.setPreferentialAmount("0");
- }
- //鍑忓厤閲戦
- if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallTypeTwo()) && reportFeeMonthStatistics.getDiscountSmallTypeTwo().equals("2")) {
- //鑾峰彇鍑忓厤閲戦
- Double discountPrice = Double.valueOf(reportFeeMonthStatistics.getDiscountPriceTwo());
- totalDeductionAmount = totalDeductionAmount + discountPrice;
- //鍑忓厤閲戦
- reportFeeMonthStatistics.setDeductionAmount(reportFeeMonthStatistics.getDiscountPriceTwo());
- } else {
- reportFeeMonthStatistics.setDeductionAmount("0");
- }
- //婊炵撼閲�
- if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallTypeThree()) && reportFeeMonthStatistics.getDiscountSmallTypeThree().equals("3")) {
- //鑾峰彇婊炵撼閲戦噾棰�
- Double discountPrice = (Double.valueOf(reportFeeMonthStatistics.getDiscountPriceThree()));
- totalLateFee = totalLateFee + discountPrice;
- //婊炵撼閲�
- reportFeeMonthStatistics.setLateFee(reportFeeMonthStatistics.getDiscountPriceThree());
- } else {
- reportFeeMonthStatistics.setLateFee("0");
- }
- //绌虹疆鎴挎墦鎶�
- if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallTypeFour()) && reportFeeMonthStatistics.getDiscountSmallTypeFour().equals("4")) {
- //绌虹疆鎴挎墦鎶橀噾棰�
- Double discountPrice = Double.valueOf(reportFeeMonthStatistics.getDiscountPriceFour());
- totalVacantHousingDiscount = totalVacantHousingDiscount + discountPrice;
- //绌虹疆鎴挎墦鎶�
- reportFeeMonthStatistics.setVacantHousingDiscount(reportFeeMonthStatistics.getDiscountPriceFour());
- } else {
- reportFeeMonthStatistics.setVacantHousingDiscount("0");
- }
- //绌虹疆鎴垮噺鍏�
- if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallTypeFive()) && reportFeeMonthStatistics.getDiscountSmallTypeFive().equals("5")) {
- //绌虹疆鎴垮噺鍏嶉噾棰�
- Double discountPrice = Double.valueOf(reportFeeMonthStatistics.getDiscountPriceFive());
- totalVacantHousingReduction = totalVacantHousingReduction + discountPrice;
- //绌虹疆鎴垮噺鍏�
- reportFeeMonthStatistics.setVacantHousingReduction(reportFeeMonthStatistics.getDiscountPriceFive());
- } else {
- reportFeeMonthStatistics.setVacantHousingReduction("0");
- }
- //璧犻�侀噾棰�
- if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallTypeSix()) && reportFeeMonthStatistics.getDiscountSmallTypeSix().equals("6")) {
- //璧犻�侀噾棰�
- Double discountPrice = Double.valueOf(reportFeeMonthStatistics.getDiscountPriceSix());
- totalGiftAmount = totalGiftAmount + discountPrice;
- //璧犻�侀噾棰�
- reportFeeMonthStatistics.setGiftAmount(reportFeeMonthStatistics.getDiscountPriceSix());
- } else {
- reportFeeMonthStatistics.setGiftAmount("0");
- }
- if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(reportFeeMonthStatistics.getPayerObjType())) {
- reportFeeMonthStatistics.setObjName(reportFeeMonthStatistics.getFloorNum()
- + "鏍�" + reportFeeMonthStatistics.getUnitNum()
- + "鍗曞厓" + reportFeeMonthStatistics.getRoomNum() + "瀹�");
- } else if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(reportFeeMonthStatistics.getPayerObjType())) {
- reportFeeMonthStatistics.setObjName(reportFeeMonthStatistics.getCarNum());
- } else {
- reportFeeMonthStatistics.setObjName(reportFeeMonthStatistics.getContractCode());
-
- }
- if (!StringUtil.isEmpty(reportFeeMonthStatistics.getImportFeeName())) {
- reportFeeMonthStatistics.setFeeName(reportFeeMonthStatistics.getImportFeeName());
- }
- if (!StringUtil.isEmpty(reportFeeMonthStatistics.getRepairId())) {
- RepairDto repairDto = new RepairDto();
- repairDto.setRepairId(reportFeeMonthStatistics.getRepairId());
- //鏌ヨ鎶ヤ慨鍗�
- List<RepairDto> repairDtos = repairInnerServiceSMOImpl.queryRepairs(repairDto);
- //Assert.listOnlyOne(repairDtos, "鏌ヨ鎶ヤ慨鍗曢敊璇紒");
- if (repairDtos != null && repairDtos.size() == 1) {
- if (!StringUtil.isEmpty(repairDtos.get(0).getRepairObjType()) && repairDtos.get(0).getRepairObjType().equals("004")) {
- OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
- ownerRoomRelDto.setRoomId(repairDtos.get(0).getRepairObjId());
- List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
- if (ownerRoomRelDtos != null && ownerRoomRelDtos.size() == 0) { //鏌ヨ鏉℃暟涓�0鏉�
- OwnerRoomRelDto ownerRoomRel = new OwnerRoomRelDto();
- ownerRoomRel.setRoomId(repairDtos.get(0).getRepairObjId());
- ownerRoomRel.setStatusCd("1"); //鐪嬬湅涓氫富鎴垮眿鍏崇郴鏁版嵁鏄惁鍒犻櫎浜�
- List<OwnerRoomRelDto> ownerRoomRels = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRel);
- Assert.listOnlyOne(ownerRoomRels, "鏌ヨ涓氫富鎴垮眿鍏崇郴琛ㄩ敊璇紒");
- OwnerDto owner = new OwnerDto();
- owner.setOwnerId(ownerRoomRels.get(0).getOwnerId());
- owner.setOwnerTypeCd("1001"); //涓氫富鏈汉
- List<OwnerDto> owners = ownerInnerServiceSMOImpl.queryOwners(owner);
- if (owners != null && owners.size() == 0) { //鏌ュ嚭鏉℃暟涓�0鏉�
- //鍒ゆ柇涓氫富鏄惁鍒犻櫎浜�
- OwnerDto newOwner = new OwnerDto();
- newOwner.setOwnerId(ownerRoomRels.get(0).getOwnerId());
- newOwner.setOwnerTypeCd("1001"); //涓氫富鏈汉
- newOwner.setStatusCd("1");
- List<OwnerDto> newOwners = ownerInnerServiceSMOImpl.queryOwners(newOwner);
- Assert.listOnlyOne(newOwners, "鏌ヨ涓氫富淇℃伅閿欒锛�");
- reportFeeMonthStatistics.setOwnerName(newOwners.get(0).getName());
- } else if (owners != null && owners.size() == 1) { //鏌ュ嚭鏉℃暟涓�1鏉�
- reportFeeMonthStatistics.setOwnerName(owners.get(0).getName());
- } else {
- throw new IllegalArgumentException("鏌ヨ涓氫富淇℃伅閿欒锛�");
- }
- } else if (ownerRoomRelDtos != null && ownerRoomRelDtos.size() == 1) { //鏌ヨ鏉℃暟涓�1鏉�
- OwnerDto ownerDto = new OwnerDto();
- ownerDto.setOwnerId(ownerRoomRelDtos.get(0).getOwnerId());
- ownerDto.setOwnerTypeCd("1001"); //涓氫富鏈汉
- List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
- if (ownerDtos != null && ownerDtos.size() == 0) { //涓氫富鏌ヨ鏉℃暟涓�0鏉�
- //鍒ゆ柇涓氫富鏄惁鍒犻櫎浜�
- OwnerDto newOwner = new OwnerDto();
- newOwner.setOwnerId(ownerRoomRelDtos.get(0).getOwnerId());
- newOwner.setOwnerTypeCd("1001"); //涓氫富鏈汉
- newOwner.setStatusCd("1");
- List<OwnerDto> newOwners = ownerInnerServiceSMOImpl.queryOwners(newOwner);
- Assert.listOnlyOne(newOwners, "鏌ヨ涓氫富淇℃伅閿欒锛�");
- reportFeeMonthStatistics.setOwnerName(newOwners.get(0).getName());
- } else if (ownerDtos != null || ownerDtos.size() == 1) {
- reportFeeMonthStatistics.setOwnerName(ownerDtos.get(0).getName());
- } else {
- throw new IllegalArgumentException("鏌ヨ涓氫富淇℃伅閿欒锛�");
- }
- } else {
- throw new IllegalArgumentException("鏌ヨ涓氫富鎴垮眿鍏崇郴琛ㄩ敊璇紒");
- }
- }
- }
- }
- if (!hasInReportListAndMerge(reportList, reportFeeMonthStatistics)) {
- reportList.add(reportFeeMonthStatistics);
- }
- }
-
- //濡傛灉鏄溅浣嶅埛鎴垮眿淇℃伅
- if (ownerIds.size() > 0) {
- refreshReportFeeMonthStatistics(ownerIds, reportFeeMonthStatisticsDtos);
- }
-
- //搴旀敹鎬婚噾棰�(灏忚)
- reportFeeMonthStatisticsTotalDto.setTotalReceivableAmount(String.format("%.2f", totalReceivableAmount));
- //瀹炴敹閲戦(灏忚)
- reportFeeMonthStatisticsTotalDto.setTotalReceivedAmount(String.format("%.2f", totalReceivedAmount));
- //浼樻儬閲戦(灏忚)
- reportFeeMonthStatisticsTotalDto.setTotalPreferentialAmount(String.format("%.2f", totalPreferentialAmount));
- //鍑忓厤閲戦(灏忚)
- reportFeeMonthStatisticsTotalDto.setTotalDeductionAmount(String.format("%.2f", totalDeductionAmount));
- //婊炵撼閲�(灏忚)
- reportFeeMonthStatisticsTotalDto.setTotalLateFee(String.format("%.2f", totalLateFee));
- //绌虹疆鎴挎墦鎶�(灏忚)
- reportFeeMonthStatisticsTotalDto.setTotalVacantHousingDiscount(String.format("%.2f", totalVacantHousingDiscount));
- //绌虹疆鎴垮噺鍏�(灏忚)
- 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.format("%.2f", allPreferentialAmount));
- //鍑忓厤閲戦(澶ц)
- reportFeeMonthStatisticsTotalDto.setAllDeductionAmount(String.format("%.2f", allDeductionAmount));
- //婊炵撼閲�(澶ц)
- reportFeeMonthStatisticsTotalDto.setAllLateFee(String.format("%.2f", allLateFee));
- //绌虹疆鎴挎墦鎶橀噾棰�(澶ц)
- reportFeeMonthStatisticsTotalDto.setAllVacantHousingDiscount(String.format("%.2f", allVacantHousingDiscount));
- //绌虹疆鎴垮噺鍏嶉噾棰�(澶ц)
- reportFeeMonthStatisticsTotalDto.setAllVacantHousingReduction(String.format("%.2f", allVacantHousingReduction));
- //璧犻�佽鍒欓噾棰�(澶ц)
- reportFeeMonthStatisticsTotalDto.setAllGiftAmount(String.format("%.2f", allGiftAmount));
- } else {
- reportFeeMonthStatisticsDtos = new ArrayList<>();
- reportList.addAll(reportFeeMonthStatisticsDtos);
- reportFeeMonthStatisticsTotalDto = new ReportFeeMonthStatisticsTotalDto();
+ ResultVo resultVo = null;
+ if (count < 1) {
+ resultVo = new ResultVo((int) Math.ceil((double) count / (double) reportFeeMonthStatisticsDto.getRow()), count, reportFeeMonthStatisticsDtos, reportFeeMonthStatisticsTotalDto);
+ return resultVo;
}
- ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reportFeeMonthStatisticsDto.getRow()), count, reportList, reportFeeMonthStatisticsTotalDto);
+ //todo 鏌ヨ缂磋垂鏄庣粏
+ reportFeeMonthStatisticsDtos = reportFeeMonthStatisticsInnerServiceSMOImpl.queryPayFeeDetail(reportFeeMonthStatisticsDto);
+ //todo 搴旀敹閲戦(澶ц)
+ reportFeeMonthStatisticsTotalDto.setAllReceivableAmount(String.format("%.2f", countInfo.getDouble("totalReceivableAmount")));
+ //todo 瀹炴敹閲戦(澶ц)
+ reportFeeMonthStatisticsTotalDto.setAllReceivedAmount(String.format("%.2f", countInfo.getDouble("totalReceivedAmount")));
+
+ //todo 鎵撴姌閲戦锛堝ぇ璁★級
+ reportFeeMonthStatisticsTotalDto.setAllPreferentialAmount(String.format("%.2f", countInfo.getDouble("discountAmount")));
+
+ //todo 鍑忓厤閲戦(澶ц)
+ reportFeeMonthStatisticsTotalDto.setAllDeductionAmount(String.format("%.2f", countInfo.getDouble("deductionAmount")));
+ //todo 婊炵撼閲�(澶ц)
+ reportFeeMonthStatisticsTotalDto.setAllLateFee(String.format("%.2f", countInfo.getDouble("lateAmount")));
+
+ //todo 璧犻�佽鍒欓噾棰�(澶ц)
+ reportFeeMonthStatisticsTotalDto.setAllGiftAmount(String.format("%.2f", countInfo.getDouble("giftAmount")));
+
+ //todo 璁＄畻灏忚
+ computeTotalInfo(reportFeeMonthStatisticsTotalDto, reportFeeMonthStatisticsDtos);
+
+ //todo 璁＄畻鎴垮眿闈㈢Н 鍜岃溅浣嶄俊鎭�
+ computeRoomAndParkingSpace(reportFeeMonthStatisticsDtos);
+
+
+ resultVo = new ResultVo((int) Math.ceil((double) count / (double) reportFeeMonthStatisticsDto.getRow()), count, reportFeeMonthStatisticsDtos, reportFeeMonthStatisticsTotalDto);
return resultVo;
}
+ private void computeRoomAndParkingSpace(List<ReportFeeMonthStatisticsDto> reportFeeMonthStatisticsDtos) {
+
+ List<String> payerObjIds = new ArrayList<>();
+
+ for (ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto : reportFeeMonthStatisticsDtos) {
+ payerObjIds.add(reportFeeMonthStatisticsDto.getPayerObjId());
+ }
+
+ if (ListUtil.isNull(payerObjIds)) {
+ return;
+ }
+ RoomDto roomDto = new RoomDto();
+ roomDto.setRoomIds(payerObjIds.toArray(new String[payerObjIds.size()]));
+ roomDto.setCommunityId(reportFeeMonthStatisticsDtos.get(0).getCommunityId());
+ List<RoomDto> roomDtos = roomV1InnerServiceSMOImpl.queryRooms(roomDto);
+
+ if(!ListUtil.isNull(roomDtos)){
+ for (ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto : reportFeeMonthStatisticsDtos) {
+ for(RoomDto tmpRoomDto: roomDtos){
+ if(reportFeeMonthStatisticsDto.getPayerObjId().equals(tmpRoomDto.getRoomId())){
+ reportFeeMonthStatisticsDto.setBuiltUpArea(tmpRoomDto.getBuiltUpArea());
+ }
+ }
+ }
+ }
+
+ OwnerCarDto ownerCarDto = new OwnerCarDto();
+ ownerCarDto.setMemberIds(payerObjIds.toArray(new String[payerObjIds.size()]));
+ ownerCarDto.setCommunityId(reportFeeMonthStatisticsDtos.get(0).getCommunityId());
+ List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
+
+ if(!ListUtil.isNull(ownerCarDtos)){
+ for (ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto : reportFeeMonthStatisticsDtos) {
+ for(OwnerCarDto tmpOwnerCarDto: ownerCarDtos){
+ if(reportFeeMonthStatisticsDto.getPayerObjId().equals(tmpOwnerCarDto.getMemberId())){
+ reportFeeMonthStatisticsDto.setPsName(tmpOwnerCarDto.getAreaNum()+"-"+tmpOwnerCarDto.getNum());
+ }
+ }
+ }
+ }
+
+ }
+
+ /**
+ * 璁＄畻澶ц灏忚
+ *
+ * @param reportFeeMonthStatisticsTotalDto
+ */
+ private void computeTotalInfo(ReportFeeMonthStatisticsTotalDto reportFeeMonthStatisticsTotalDto,
+ List<ReportFeeMonthStatisticsDto> reportFeeMonthStatisticsDtos) {
+
+ BigDecimal totalReceivedAmount = new BigDecimal(0.00);
+ BigDecimal totalPreferentialAmount = new BigDecimal(0.00);
+ BigDecimal totalDeductionAmount = new BigDecimal(0.00);
+ BigDecimal totalLateFee = new BigDecimal(0.00);
+ BigDecimal totalGiftAmount = new BigDecimal(0.00);
+
+ for (ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto : reportFeeMonthStatisticsDtos) {
+ totalReceivedAmount = totalReceivedAmount.add(new BigDecimal(reportFeeMonthStatisticsDto.getReceivedAmount()));
+ totalPreferentialAmount = totalPreferentialAmount.add(new BigDecimal(reportFeeMonthStatisticsDto.getDiscountAmount()));
+ totalDeductionAmount = totalDeductionAmount.add(new BigDecimal(reportFeeMonthStatisticsDto.getDeductionAmount()));
+ totalLateFee = totalLateFee.add(new BigDecimal(reportFeeMonthStatisticsDto.getLateAmount()));
+ totalGiftAmount = totalGiftAmount.add(new BigDecimal(reportFeeMonthStatisticsDto.getGiftAmount()));
+
+ reportFeeMonthStatisticsDto.setWithholdAmount(reportFeeMonthStatisticsDto.getAcctAmount());
+ reportFeeMonthStatisticsDto.setPreferentialAmount(reportFeeMonthStatisticsDto.getDiscountAmount());
+ reportFeeMonthStatisticsDto.setLateFee(reportFeeMonthStatisticsDto.getLateAmount());
+ }
+
+ //todo 瀹炴敹閲戦(灏忚)
+ reportFeeMonthStatisticsTotalDto.setTotalReceivedAmount(String.format("%.2f", totalReceivedAmount.doubleValue()));
+ //浼樻儬閲戦(灏忚)
+ reportFeeMonthStatisticsTotalDto.setTotalPreferentialAmount(String.format("%.2f", totalPreferentialAmount));
+ //鍑忓厤閲戦(灏忚)
+ reportFeeMonthStatisticsTotalDto.setTotalDeductionAmount(String.format("%.2f", totalDeductionAmount));
+ //婊炵撼閲�(灏忚)
+ reportFeeMonthStatisticsTotalDto.setTotalLateFee(String.format("%.2f", totalLateFee));
+
+ }
+
@Override
public ResultVo queryPrepayment(@RequestBody ReportFeeMonthStatisticsPrepaymentDto reportFeeMonthStatisticsPrepaymentDto) {
JSONObject countInfo = reportFeeMonthStatisticsPrepaymentInnerServiceSMOImpl.queryPayFeeDetailPrepaymentCount(reportFeeMonthStatisticsPrepaymentDto);
--
Gitblit v1.8.0