From dbea8ec9fde739d028d656ac7031091fae6e6c2c Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期三, 19 七月 2023 09:03:50 +0800
Subject: [PATCH] 1、新增费用提前预生成账单2、优化强制回单3、区配置新增退费收据开关4、权限优化
---
service-report/src/main/java/com/java110/report/smo/impl/QueryPayFeeDetailInnerServiceSMOImpl.java | 506 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 499 insertions(+), 7 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 9c284b8..b05d40a 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
@@ -1,7 +1,9 @@
package com.java110.report.smo.impl;
import com.alibaba.fastjson.JSONObject;
-import com.java110.core.smo.IComputeFeeSMO;
+import com.java110.dto.PageDto;
+import com.java110.dto.ReportFeeMonthStatisticsPrepaymentDto.ReportFeeMonthStatisticsPrepaymentDto;
+import com.java110.dto.ReportFeeMonthStatisticsPrepaymentDto.ReportFeeMonthStatisticsPrepaymentTotalDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.owner.OwnerDto;
@@ -13,9 +15,11 @@
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.IOwnerInnerServiceSMO;
import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +42,9 @@
private IReportFeeMonthStatisticsInnerServiceSMO reportFeeMonthStatisticsInnerServiceSMOImpl;
@Autowired
+ private IReportFeeMonthStatisticsPrepaymentInnerServiceSMO reportFeeMonthStatisticsPrepaymentInnerServiceSMOImpl;
+
+ @Autowired
private IRepairInnerServiceSMO repairInnerServiceSMOImpl;
@Autowired
@@ -45,9 +52,6 @@
@Autowired
private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;
-
- @Autowired
- private IComputeFeeSMO computeFeeSMOImpl;
@Autowired
private IFeeDetailInnerServiceSMO feeDetailInnerServiceSMOImpl;
@@ -362,16 +366,505 @@
return resultVo;
}
+ @Override
+ public ResultVo queryPrepayment(@RequestBody ReportFeeMonthStatisticsPrepaymentDto reportFeeMonthStatisticsPrepaymentDto) {
+ JSONObject countInfo = reportFeeMonthStatisticsPrepaymentInnerServiceSMOImpl.queryPayFeeDetailPrepaymentCount(reportFeeMonthStatisticsPrepaymentDto);
+ int count = Integer.parseInt(countInfo.get("count").toString());
+ List<ReportFeeMonthStatisticsPrepaymentDto> reportFeeMonthStatisticsPrepaymentDtos = null;
+ ReportFeeMonthStatisticsPrepaymentTotalDto reportFeeMonthStatisticsPrepaymentTotalDto = new ReportFeeMonthStatisticsPrepaymentTotalDto();
+ List<ReportFeeMonthStatisticsPrepaymentDto> reportList = new ArrayList<>();
+ //鏌ヨ璇ュ皬鍖轰笅鐨勮垂鐢ㄩ」鐩�
+ FeeConfigDto feeConfigDto = new FeeConfigDto();
+ feeConfigDto.setCommunityId(reportFeeMonthStatisticsPrepaymentDto.getCommunityId());
+ List<FeeConfigDto> feeConfigDtos = reportFeeMonthStatisticsPrepaymentInnerServiceSMOImpl.queryFeeConfigPrepayments(feeConfigDto);
+ //搴旀敹鎬婚噾棰�(澶ц)
+ 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;
+ //娆犺垂閲戦(澶ц)
+ Double allOweAmount = 0.0;
+ //搴旂即閲戦(澶ц)
+ Double allPayableAmount = 0.0;
+ if (count > 0) {
+ //鏌ヨ缂磋垂鏄庣粏
+ reportFeeMonthStatisticsPrepaymentDtos = reportFeeMonthStatisticsPrepaymentInnerServiceSMOImpl.queryNewPayFeeDetailPrepayment(reportFeeMonthStatisticsPrepaymentDto);
+ //鏌ヨ搴旀敹銆佸疄鏀舵�婚噾棰�(澶ц)
+ List<ReportFeeMonthStatisticsPrepaymentDto> reportFeeMonthStatisticsPrepaymentList = reportFeeMonthStatisticsPrepaymentInnerServiceSMOImpl.queryAllPayFeeDetailPrepayment(reportFeeMonthStatisticsPrepaymentDto);
+ //鏌ヨ(浼樻儬銆佸噺鍏嶃�佹粸绾抽噾銆佺┖缃埧鎵撴姌銆佺┖缃埧鍑忓厤閲戦绛�)澶ц鎬婚噾棰�
+ List<ReportFeeMonthStatisticsPrepaymentDto> reportFeeMonthStatisticsPrepaymentSum = reportFeeMonthStatisticsPrepaymentInnerServiceSMOImpl.queryPayFeeDetailPrepaymentSum(reportFeeMonthStatisticsPrepaymentDto);
+ allReceivableAmount = Double.valueOf(reportFeeMonthStatisticsPrepaymentList.get(0).getAllReceivableAmount());
+ allReceivedAmount = Double.valueOf(reportFeeMonthStatisticsPrepaymentList.get(0).getAllReceivedAmount());
+ allOweAmount = Double.valueOf(reportFeeMonthStatisticsPrepaymentList.get(0).getAllOweAmount());
+ allPayableAmount = Double.valueOf(reportFeeMonthStatisticsPrepaymentList.get(0).getAllPayableAmount());
+ for (ReportFeeMonthStatisticsPrepaymentDto reportFeeMonthStatisticsPrepayment : reportFeeMonthStatisticsPrepaymentSum) {
+ //杩欓噷鏄煡璇㈠嚭鐨勯噾棰濇�诲拰
+ String discountPrice = reportFeeMonthStatisticsPrepayment.getDiscountPrice();
+ // discountSmallType 1: 鎵撴姌 2:鍑忓厤 3:婊炵撼閲� 4:绌虹疆鎴挎墦鎶� 5:绌虹疆鎴垮噺鍏� 6:璧犻��
+ //浼樻儬閲戦(澶ц)
+ if (!StringUtil.isEmpty(discountPrice) && !StringUtil.isEmpty(reportFeeMonthStatisticsPrepayment.getDiscountSmallType()) && reportFeeMonthStatisticsPrepayment.getDiscountSmallType().equals("1")) {
+ Double aDouble = Double.valueOf(discountPrice);
+ allPreferentialAmount = allPreferentialAmount + aDouble;
+ }
+ //鍑忓厤閲戦(澶ц)
+ if (!StringUtil.isEmpty(discountPrice) && !StringUtil.isEmpty(reportFeeMonthStatisticsPrepayment.getDiscountSmallType()) && reportFeeMonthStatisticsPrepayment.getDiscountSmallType().equals("2")) {
+ Double aDouble = Double.valueOf(discountPrice);
+ allDeductionAmount = allDeductionAmount + aDouble;
+ }
+ //婊炵撼閲�(澶ц)
+ if (!StringUtil.isEmpty(discountPrice) && !StringUtil.isEmpty(reportFeeMonthStatisticsPrepayment.getDiscountSmallType()) && reportFeeMonthStatisticsPrepayment.getDiscountSmallType().equals("3")) {
+ Double aDouble = Double.valueOf(discountPrice);
+ allLateFee = allLateFee + aDouble;
+ }
+ //绌虹疆鎴挎墦鎶橀噾棰�(澶ц)
+ if (!StringUtil.isEmpty(discountPrice) && !StringUtil.isEmpty(reportFeeMonthStatisticsPrepayment.getDiscountSmallType()) && reportFeeMonthStatisticsPrepayment.getDiscountSmallType().equals("4")) {
+ Double aDouble = Double.valueOf(discountPrice);
+ allVacantHousingDiscount = allVacantHousingDiscount + aDouble;
+ }
+ //绌虹疆鎴垮噺鍏嶉噾棰�(澶ц)
+ if (!StringUtil.isEmpty(discountPrice) && !StringUtil.isEmpty(reportFeeMonthStatisticsPrepayment.getDiscountSmallType()) && reportFeeMonthStatisticsPrepayment.getDiscountSmallType().equals("5")) {
+ Double aDouble = Double.valueOf(discountPrice);
+ allVacantHousingReduction = allVacantHousingReduction + aDouble;
+ }
+ //璧犻�侀噾棰�(澶ц)
+ if (!StringUtil.isEmpty(discountPrice) && !StringUtil.isEmpty(reportFeeMonthStatisticsPrepayment.getDiscountSmallType()) && reportFeeMonthStatisticsPrepayment.getDiscountSmallType().equals("6")) {
+ 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;
+ //娆犺垂閲戦(灏忚)
+ Double totalOweAmount = 0.0;
+ //搴旂即閲戦(灏忚)
+ Double totalPayableAmount = 0.0;
+ for (ReportFeeMonthStatisticsPrepaymentDto reportFeeMonthStatisticsPrepayment : reportFeeMonthStatisticsPrepaymentDtos) {
+ //搴旀敹閲戦
+ Double receivableAmount = 0.0;
+ if (!StringUtil.isEmpty(reportFeeMonthStatisticsPrepayment.getPrepaymentReceivableAmount())) {
+ receivableAmount = Double.valueOf(reportFeeMonthStatisticsPrepayment.getPrepaymentReceivableAmount());
+ }
+ //瀹炴敹閲戦
+ Double receivedAmount = 0.0;
+ if (!StringUtil.isEmpty(reportFeeMonthStatisticsPrepayment.getPrepaymentReceivedAmount())) {
+ receivedAmount = Double.valueOf(reportFeeMonthStatisticsPrepayment.getPrepaymentReceivedAmount());
+ }
+ //娆犺垂閲戦
+ Double oweAmount = 0.0;
+ if (!StringUtil.isEmpty(reportFeeMonthStatisticsPrepayment.getOweAmount())) {
+ oweAmount = Double.valueOf(reportFeeMonthStatisticsPrepayment.getOweAmount());
+ }
+ //搴旂即閲戦
+ Double payableAmount = 0.0;
+ if (!StringUtil.isEmpty(reportFeeMonthStatisticsPrepayment.getPayableAmount())) {
+ payableAmount = Double.valueOf(reportFeeMonthStatisticsPrepayment.getPayableAmount());
+ }
+ totalReceivableAmount = totalReceivableAmount + receivableAmount;
+ totalReceivedAmount = totalReceivedAmount + receivedAmount;
+ totalOweAmount = totalOweAmount + oweAmount;
+ totalPayableAmount = totalPayableAmount + payableAmount;
+ ReportFeeMonthStatisticsPrepaymentDto reportFeeMonthStatisticsPrepaymentDto1 = new ReportFeeMonthStatisticsPrepaymentDto();
+ reportFeeMonthStatisticsPrepaymentDto1.setPrepaymentId(reportFeeMonthStatisticsPrepayment.getPrepaymentId());
+ List<ReportFeeMonthStatisticsPrepaymentDto> reportFeeMonthStatisticsPrepayments = reportFeeMonthStatisticsPrepaymentInnerServiceSMOImpl.queryPayFeeDetailPrepayment(reportFeeMonthStatisticsPrepaymentDto1);
+ for (ReportFeeMonthStatisticsPrepaymentDto reportFeeMonthStatistics : reportFeeMonthStatisticsPrepayments) {
+ //浼樻儬閲戦
+ if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountPrice()) && !StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType())
+ && reportFeeMonthStatistics.getDiscountSmallType().equals("1")) {
+ //鑾峰彇浼樻儬閲戦
+ Double discountPrice = Double.valueOf(reportFeeMonthStatistics.getDiscountPrice());
+ totalPreferentialAmount = totalPreferentialAmount + discountPrice;
+ //浼樻儬閲戦
+ reportFeeMonthStatisticsPrepayment.setPreferentialAmount(reportFeeMonthStatistics.getDiscountPrice());
+ } else if (StringUtil.isEmpty(reportFeeMonthStatisticsPrepayment.getPreferentialAmount())) {
+ reportFeeMonthStatisticsPrepayment.setPreferentialAmount("0");
+ }
+ //鍑忓厤閲戦
+ if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountPrice()) && !StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType())
+ && reportFeeMonthStatistics.getDiscountSmallType().equals("2")) {
+ //鑾峰彇鍑忓厤閲戦
+ Double discountPrice = Double.valueOf(reportFeeMonthStatistics.getDiscountPrice());
+ totalDeductionAmount = totalDeductionAmount + discountPrice;
+ //鍑忓厤閲戦
+ reportFeeMonthStatisticsPrepayment.setDeductionAmount(reportFeeMonthStatistics.getDiscountPrice());
+ } else if (StringUtil.isEmpty(reportFeeMonthStatisticsPrepayment.getDeductionAmount())) {
+ reportFeeMonthStatisticsPrepayment.setDeductionAmount("0");
+ }
+ //婊炵撼閲�
+ if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountPrice()) && !StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType())
+ && reportFeeMonthStatistics.getDiscountSmallType().equals("3")) {
+ //鑾峰彇婊炵撼閲戦噾棰�
+ Double discountPrice = (Double.valueOf(reportFeeMonthStatistics.getDiscountPrice()));
+ totalLateFee = totalLateFee + discountPrice;
+ //婊炵撼閲�
+ reportFeeMonthStatisticsPrepayment.setLateFee(reportFeeMonthStatistics.getDiscountPrice());
+ } else if (StringUtil.isEmpty(reportFeeMonthStatisticsPrepayment.getLateFee())) {
+ reportFeeMonthStatisticsPrepayment.setLateFee("0");
+ }
+ //绌虹疆鎴挎墦鎶�
+ if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountPrice()) && !StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType())
+ && reportFeeMonthStatistics.getDiscountSmallType().equals("4")) {
+ //绌虹疆鎴挎墦鎶橀噾棰�
+ Double discountPrice = Double.valueOf(reportFeeMonthStatistics.getDiscountPrice());
+ totalVacantHousingDiscount = totalVacantHousingDiscount + discountPrice;
+ //绌虹疆鎴挎墦鎶�
+ reportFeeMonthStatisticsPrepayment.setVacantHousingDiscount(reportFeeMonthStatistics.getDiscountPrice());
+ } else if (StringUtil.isEmpty(reportFeeMonthStatisticsPrepayment.getVacantHousingDiscount())) {
+ reportFeeMonthStatisticsPrepayment.setVacantHousingDiscount("0");
+ }
+ //绌虹疆鎴垮噺鍏�
+ if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountPrice()) && !StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType())
+ && reportFeeMonthStatistics.getDiscountSmallType().equals("5")) {
+ //绌虹疆鎴垮噺鍏嶉噾棰�
+ Double discountPrice = Double.valueOf(reportFeeMonthStatistics.getDiscountPrice());
+ totalVacantHousingReduction = totalVacantHousingReduction + discountPrice;
+ //绌虹疆鎴垮噺鍏�
+ reportFeeMonthStatisticsPrepayment.setVacantHousingReduction(reportFeeMonthStatistics.getDiscountPrice());
+ } else if (StringUtil.isEmpty(reportFeeMonthStatisticsPrepayment.getVacantHousingReduction())) {
+ reportFeeMonthStatisticsPrepayment.setVacantHousingReduction("0");
+ }
+ //璧犻�侀噾棰�
+ if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountPrice()) && !StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType())
+ && reportFeeMonthStatistics.getDiscountSmallType().equals("6")) {
+ //璧犻�侀噾棰�
+ Double discountPrice = Double.valueOf(reportFeeMonthStatistics.getDiscountPrice());
+ totalGiftAmount = totalGiftAmount + discountPrice;
+ //璧犻�侀噾棰�
+ reportFeeMonthStatisticsPrepayment.setGiftAmount(reportFeeMonthStatistics.getDiscountPrice());
+ } else if (StringUtil.isEmpty(reportFeeMonthStatisticsPrepayment.getGiftAmount())) {
+ reportFeeMonthStatisticsPrepayment.setGiftAmount("0");
+ }
+ }
+ //璐圭敤椤圭洰
+ reportFeeMonthStatisticsPrepayment.setFeeConfigDtos(feeConfigDtos);
+ reportList.add(reportFeeMonthStatisticsPrepayment);
+ }
+ //搴旀敹鎬婚噾棰�(灏忚)
+ reportFeeMonthStatisticsPrepaymentTotalDto.setTotalReceivableAmount(String.format("%.2f", totalReceivableAmount));
+ //瀹炴敹閲戦(灏忚)
+ reportFeeMonthStatisticsPrepaymentTotalDto.setTotalReceivedAmount(String.format("%.2f", totalReceivedAmount));
+ //娆犺垂閲戦(灏忚)
+ reportFeeMonthStatisticsPrepaymentTotalDto.setTotalOweAmount(String.format("%.2f", totalOweAmount));
+ //搴旂即閲戦(灏忚)
+ reportFeeMonthStatisticsPrepaymentTotalDto.setTotalPayableAmount(String.format("%.2f", totalPayableAmount));
+ //浼樻儬閲戦(灏忚)
+ reportFeeMonthStatisticsPrepaymentTotalDto.setTotalPreferentialAmount(String.format("%.2f", totalPreferentialAmount));
+ //鍑忓厤閲戦(灏忚)
+ reportFeeMonthStatisticsPrepaymentTotalDto.setTotalDeductionAmount(String.format("%.2f", totalDeductionAmount));
+ //婊炵撼閲�(灏忚)
+ reportFeeMonthStatisticsPrepaymentTotalDto.setTotalLateFee(String.format("%.2f", totalLateFee));
+ //绌虹疆鎴挎墦鎶�(灏忚)
+ reportFeeMonthStatisticsPrepaymentTotalDto.setTotalVacantHousingDiscount(String.format("%.2f", totalVacantHousingDiscount));
+ //绌虹疆鎴垮噺鍏�(灏忚)
+ reportFeeMonthStatisticsPrepaymentTotalDto.setTotalVacantHousingReduction(String.format("%.2f", totalVacantHousingReduction));
+ //璧犻�佽鍒欓噾棰�(灏忚)
+ reportFeeMonthStatisticsPrepaymentTotalDto.setTotalGiftAmount(String.format("%.2f", totalGiftAmount));
+ //搴旀敹閲戦(澶ц)
+ reportFeeMonthStatisticsPrepaymentTotalDto.setAllReceivableAmount(String.format("%.2f", allReceivableAmount));
+ //娆犺垂閲戦(澶ц)
+ reportFeeMonthStatisticsPrepaymentTotalDto.setAllOweAmount(String.format("%.2f", allOweAmount));
+ //娆犺垂閲戦(澶ц)
+ reportFeeMonthStatisticsPrepaymentTotalDto.setAllPayableAmount(String.format("%.2f", allPayableAmount));
+ //瀹炴敹閲戦(澶ц)
+ reportFeeMonthStatisticsPrepaymentTotalDto.setAllReceivedAmount(String.format("%.2f", allReceivedAmount));
+ //浼樻儬閲戦(澶ц)
+ reportFeeMonthStatisticsPrepaymentTotalDto.setAllPreferentialAmount(String.format("%.2f", allPreferentialAmount));
+ //鍑忓厤閲戦(澶ц)
+ reportFeeMonthStatisticsPrepaymentTotalDto.setAllDeductionAmount(String.format("%.2f", allDeductionAmount));
+ //婊炵撼閲�(澶ц)
+ reportFeeMonthStatisticsPrepaymentTotalDto.setAllLateFee(String.format("%.2f", allLateFee));
+ //绌虹疆鎴挎墦鎶橀噾棰�(澶ц)
+ reportFeeMonthStatisticsPrepaymentTotalDto.setAllVacantHousingDiscount(String.format("%.2f", allVacantHousingDiscount));
+ //绌虹疆鎴垮噺鍏嶉噾棰�(澶ц)
+ reportFeeMonthStatisticsPrepaymentTotalDto.setAllVacantHousingReduction(String.format("%.2f", allVacantHousingReduction));
+ //璧犻�佽鍒欓噾棰�(澶ц)
+ reportFeeMonthStatisticsPrepaymentTotalDto.setAllGiftAmount(String.format("%.2f", allGiftAmount));
+ } else {
+ reportFeeMonthStatisticsPrepaymentDtos = new ArrayList<>();
+ reportList.addAll(reportFeeMonthStatisticsPrepaymentDtos);
+ reportFeeMonthStatisticsPrepaymentTotalDto = new ReportFeeMonthStatisticsPrepaymentTotalDto();
+ }
+// count = reportList.size();
+ ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reportFeeMonthStatisticsPrepaymentDto.getRow()), count, reportList, reportFeeMonthStatisticsPrepaymentTotalDto);
+ return resultVo;
+ }
+
+ @Override
+ public ResultVo queryReportCollectFees(@RequestBody ReportFeeMonthStatisticsPrepaymentDto reportFeeMonthStatisticsPrepaymentDto) {
+ ReportFeeMonthStatisticsPrepaymentDto feeMonthStatisticsPrepayment = BeanConvertUtil.covertBean(reportFeeMonthStatisticsPrepaymentDto, ReportFeeMonthStatisticsPrepaymentDto.class);
+ //鏌ヨ棰勪粯鏈熻处鍗曟姤琛ㄧ殑璐圭敤椤筩onfigId
+ List<ReportFeeMonthStatisticsPrepaymentDto> configIds = reportFeeMonthStatisticsPrepaymentInnerServiceSMOImpl.queryPrepaymentConfigs(feeMonthStatisticsPrepayment);
+ int count = configIds.size();
+ List<ReportFeeMonthStatisticsPrepaymentDto> reportList = new ArrayList<>();
+ //鏌ヨ璇ュ皬鍖轰笅鐨勮垂鐢ㄩ」鐩�
+ FeeConfigDto feeConfigDto = new FeeConfigDto();
+ feeConfigDto.setCommunityId(reportFeeMonthStatisticsPrepaymentDto.getCommunityId());
+ if (count > 0) {
+ for (ReportFeeMonthStatisticsPrepaymentDto feeMonthStatisticsPrepaymentDto : configIds) {
+ reportFeeMonthStatisticsPrepaymentDto.setConfigId(feeMonthStatisticsPrepaymentDto.getConfigId());
+ if (reportFeeMonthStatisticsPrepaymentDto.getPage() == 0) {
+ reportFeeMonthStatisticsPrepaymentDto.setPage(1);
+ }
+ //鏌ヨ缂磋垂鏄庣粏
+ List<ReportFeeMonthStatisticsPrepaymentDto> reportFeeMonthStatisticsPrepaymentDtos = reportFeeMonthStatisticsPrepaymentInnerServiceSMOImpl.queryPayFeeDetailPrepayment(reportFeeMonthStatisticsPrepaymentDto);
+ if (reportFeeMonthStatisticsPrepaymentDtos == null || reportFeeMonthStatisticsPrepaymentDtos.size() < 1) {
+ continue;
+ }
+ //鏌ヨ搴旀敹銆佸疄鏀舵�婚噾棰�(澶ц)
+ List<ReportFeeMonthStatisticsPrepaymentDto> reportFeeMonthStatisticsPrepaymentList = reportFeeMonthStatisticsPrepaymentInnerServiceSMOImpl.queryAllPayFeeDetailPrepayment(reportFeeMonthStatisticsPrepaymentDto);
+ //鏌ヨ(浼樻儬銆佸噺鍏嶃�佹粸绾抽噾銆佺┖缃埧鎵撴姌銆佺┖缃埧鍑忓厤閲戦绛�)澶ц鎬婚噾棰�
+ List<ReportFeeMonthStatisticsPrepaymentDto> reportFeeMonthStatisticsPrepaymentSum = reportFeeMonthStatisticsPrepaymentInnerServiceSMOImpl.queryPayFeeDetailPrepaymentSum(reportFeeMonthStatisticsPrepaymentDto);
+ //搴旀敹鎬婚噾棰�(澶ц)
+ 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;
+ //娆犺垂閲戦(澶ц)
+ Double allOweAmount = 0.0;
+ //搴旂即閲戦(澶ц)
+ Double allPayableAmount = 0.0;
+ allReceivableAmount = Double.valueOf(reportFeeMonthStatisticsPrepaymentList.get(0).getAllReceivableAmount());
+ allReceivedAmount = Double.valueOf(reportFeeMonthStatisticsPrepaymentList.get(0).getAllReceivedAmount());
+ allOweAmount = Double.valueOf(reportFeeMonthStatisticsPrepaymentList.get(0).getAllOweAmount());
+ allPayableAmount = Double.valueOf(reportFeeMonthStatisticsPrepaymentList.get(0).getAllPayableAmount());
+ for (ReportFeeMonthStatisticsPrepaymentDto reportFeeMonthStatisticsPrepayment : reportFeeMonthStatisticsPrepaymentSum) {
+ //杩欓噷鏄煡璇㈠嚭鐨勯噾棰濇�诲拰
+ String discountPrice = reportFeeMonthStatisticsPrepayment.getDiscountPrice();
+ // discountSmallType 1: 鎵撴姌 2:鍑忓厤 3:婊炵撼閲� 4:绌虹疆鎴挎墦鎶� 5:绌虹疆鎴垮噺鍏� 6:璧犻��
+ //浼樻儬閲戦(澶ц)
+ if (!StringUtil.isEmpty(discountPrice) && !StringUtil.isEmpty(reportFeeMonthStatisticsPrepayment.getDiscountSmallType()) && reportFeeMonthStatisticsPrepayment.getDiscountSmallType().equals("1")) {
+ Double aDouble = Double.valueOf(discountPrice);
+ allPreferentialAmount = allPreferentialAmount + aDouble;
+ }
+ //鍑忓厤閲戦(澶ц)
+ if (!StringUtil.isEmpty(discountPrice) && !StringUtil.isEmpty(reportFeeMonthStatisticsPrepayment.getDiscountSmallType()) && reportFeeMonthStatisticsPrepayment.getDiscountSmallType().equals("2")) {
+ Double aDouble = Double.valueOf(discountPrice);
+ allDeductionAmount = allDeductionAmount + aDouble;
+ }
+ //婊炵撼閲�(澶ц)
+ if (!StringUtil.isEmpty(discountPrice) && !StringUtil.isEmpty(reportFeeMonthStatisticsPrepayment.getDiscountSmallType()) && reportFeeMonthStatisticsPrepayment.getDiscountSmallType().equals("3")) {
+ Double aDouble = Double.valueOf(discountPrice);
+ allLateFee = allLateFee + aDouble;
+ }
+ //绌虹疆鎴挎墦鎶橀噾棰�(澶ц)
+ if (!StringUtil.isEmpty(discountPrice) && !StringUtil.isEmpty(reportFeeMonthStatisticsPrepayment.getDiscountSmallType()) && reportFeeMonthStatisticsPrepayment.getDiscountSmallType().equals("4")) {
+ Double aDouble = Double.valueOf(discountPrice);
+ allVacantHousingDiscount = allVacantHousingDiscount + aDouble;
+ }
+ //绌虹疆鎴垮噺鍏嶉噾棰�(澶ц)
+ if (!StringUtil.isEmpty(discountPrice) && !StringUtil.isEmpty(reportFeeMonthStatisticsPrepayment.getDiscountSmallType()) && reportFeeMonthStatisticsPrepayment.getDiscountSmallType().equals("5")) {
+ Double aDouble = Double.valueOf(discountPrice);
+ allVacantHousingReduction = allVacantHousingReduction + aDouble;
+ }
+ //璧犻�侀噾棰�(澶ц)
+ if (!StringUtil.isEmpty(discountPrice) && !StringUtil.isEmpty(reportFeeMonthStatisticsPrepayment.getDiscountSmallType()) && reportFeeMonthStatisticsPrepayment.getDiscountSmallType().equals("6")) {
+ Double aDouble = Double.valueOf(discountPrice);
+ allGiftAmount = allGiftAmount + aDouble;
+ }
+ }
+ ReportFeeMonthStatisticsPrepaymentDto feeMonthStatistics = new ReportFeeMonthStatisticsPrepaymentDto();
+ //璐圭敤鍚嶇О
+ feeMonthStatistics.setFeeName(reportFeeMonthStatisticsPrepaymentDtos.get(0).getFeeName());
+ feeMonthStatistics.setFeeTypeCd(reportFeeMonthStatisticsPrepaymentDtos.get(0).getFeeTypeCd());
+ feeMonthStatistics.setFeeTypeCdName(reportFeeMonthStatisticsPrepaymentDtos.get(0).getFeeTypeCdName());
+ //搴旀敹閲戦(澶ц)
+ feeMonthStatistics.setAllReceivableAmount(String.format("%.2f", allReceivableAmount));
+ //娆犺垂閲戦(澶ц)
+ feeMonthStatistics.setAllOweAmount(String.format("%.2f", allOweAmount));
+ //搴旂即閲戦(澶ц)
+ feeMonthStatistics.setAllPayableAmount(String.format("%.2f", allPayableAmount));
+ //瀹炴敹閲戦(澶ц)
+ feeMonthStatistics.setAllReceivedAmount(String.format("%.2f", allReceivedAmount));
+ //浼樻儬閲戦(澶ц)
+ feeMonthStatistics.setAllPreferentialAmount(String.format("%.2f", allPreferentialAmount));
+ //鍑忓厤閲戦(澶ц)
+ feeMonthStatistics.setAllDeductionAmount(String.format("%.2f", allDeductionAmount));
+ //婊炵撼閲�(澶ц)
+ feeMonthStatistics.setAllLateFee(String.format("%.2f", allLateFee));
+ //绌虹疆鎴挎墦鎶橀噾棰�(澶ц)
+ feeMonthStatistics.setAllVacantHousingDiscount(String.format("%.2f", allVacantHousingDiscount));
+ //绌虹疆鎴垮噺鍏嶉噾棰�(澶ц)
+ feeMonthStatistics.setAllVacantHousingReduction(String.format("%.2f", allVacantHousingReduction));
+ //璧犻�佽鍒欓噾棰�(澶ц)
+ feeMonthStatistics.setAllGiftAmount(String.format("%.2f", allGiftAmount));
+ reportList.add(feeMonthStatistics);
+ }
+ } else {
+ reportList = new ArrayList<>();
+ }
+ //鑾峰彇鏀惰垂鐘跺喌琛ㄥぇ璁°�佸皬璁�
+ ReportFeeMonthStatisticsPrepaymentTotalDto reportFeeMonthStatisticsPrepaymentTotal = getReportFeeMonthStatisticsPrepaymentTotal(feeMonthStatisticsPrepayment);
+ ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reportFeeMonthStatisticsPrepaymentDto.getRow()), count, reportList, reportFeeMonthStatisticsPrepaymentTotal);
+ return resultVo;
+ }
+
+ //鑾峰彇鏀惰垂鐘跺喌琛ㄥぇ璁°�佸皬璁�
+ private ReportFeeMonthStatisticsPrepaymentTotalDto getReportFeeMonthStatisticsPrepaymentTotal(ReportFeeMonthStatisticsPrepaymentDto reportFeeMonthStatisticsPrepaymentDto) {
+ ReportFeeMonthStatisticsPrepaymentTotalDto reportFeeMonthStatisticsPrepaymentTotal = new ReportFeeMonthStatisticsPrepaymentTotalDto();
+ //鏌ヨ搴旂即銆佸簲鏀躲�佸疄鏀躲�佹瑺璐归噾棰�(灏忚)
+ if (reportFeeMonthStatisticsPrepaymentDto.getPage() == 0) {
+ reportFeeMonthStatisticsPrepaymentDto.setPage(1);
+ }
+ List<ReportFeeMonthStatisticsPrepaymentDto> feeMonthStatisticsPrepaymentDtos = reportFeeMonthStatisticsPrepaymentInnerServiceSMOImpl.queryAllPrepaymentConfigs(reportFeeMonthStatisticsPrepaymentDto);
+ if (feeMonthStatisticsPrepaymentDtos != null && feeMonthStatisticsPrepaymentDtos.size() == 1) {
+ reportFeeMonthStatisticsPrepaymentTotal.setTotalPayableAmount(feeMonthStatisticsPrepaymentDtos.get(0).getAllPayableAmount()); //搴旂即閲戦(灏忚)
+ reportFeeMonthStatisticsPrepaymentTotal.setTotalReceivableAmount(feeMonthStatisticsPrepaymentDtos.get(0).getAllReceivableAmount()); //搴旀敹閲戦(灏忚)
+ reportFeeMonthStatisticsPrepaymentTotal.setTotalReceivedAmount(feeMonthStatisticsPrepaymentDtos.get(0).getAllReceivedAmount()); //瀹炴敹閲戦(灏忚)
+ reportFeeMonthStatisticsPrepaymentTotal.setTotalOweAmount(feeMonthStatisticsPrepaymentDtos.get(0).getAllOweAmount()); //娆犺垂閲戦(灏忚)
+ } else {
+ reportFeeMonthStatisticsPrepaymentTotal.setTotalPayableAmount("0.0"); //搴旂即閲戦(灏忚)
+ reportFeeMonthStatisticsPrepaymentTotal.setTotalReceivableAmount("0.0"); //搴旀敹閲戦(灏忚)
+ reportFeeMonthStatisticsPrepaymentTotal.setTotalReceivedAmount("0.0"); //瀹炴敹閲戦(灏忚)
+ reportFeeMonthStatisticsPrepaymentTotal.setTotalOweAmount("0.0"); //娆犺垂閲戦(灏忚)
+ }
+ //鏌ヨ搴旂即銆佸簲鏀躲�佸疄鏀躲�佹瑺璐归噾棰�(澶ц)
+ reportFeeMonthStatisticsPrepaymentDto.setPage(PageDto.DEFAULT_PAGE);
+ List<ReportFeeMonthStatisticsPrepaymentDto> feeMonthStatisticsPrepayments = reportFeeMonthStatisticsPrepaymentInnerServiceSMOImpl.queryAllPrepaymentConfigs(reportFeeMonthStatisticsPrepaymentDto);
+ if (feeMonthStatisticsPrepayments != null && feeMonthStatisticsPrepayments.size() == 1) {
+ reportFeeMonthStatisticsPrepaymentTotal.setAllPayableAmount(feeMonthStatisticsPrepayments.get(0).getAllPayableAmount()); //搴旂即閲戦(灏忚)
+ reportFeeMonthStatisticsPrepaymentTotal.setAllReceivableAmount(feeMonthStatisticsPrepayments.get(0).getAllReceivableAmount()); //搴旀敹閲戦(灏忚)
+ reportFeeMonthStatisticsPrepaymentTotal.setAllReceivedAmount(feeMonthStatisticsPrepayments.get(0).getAllReceivedAmount()); //瀹炴敹閲戦(灏忚)
+ reportFeeMonthStatisticsPrepaymentTotal.setAllOweAmount(feeMonthStatisticsPrepayments.get(0).getAllOweAmount()); //娆犺垂閲戦(灏忚)
+ } else {
+ reportFeeMonthStatisticsPrepaymentTotal.setAllPayableAmount("0.0"); //搴旂即閲戦(灏忚)
+ reportFeeMonthStatisticsPrepaymentTotal.setAllReceivableAmount("0.0"); //搴旀敹閲戦(灏忚)
+ reportFeeMonthStatisticsPrepaymentTotal.setAllReceivedAmount("0.0"); //瀹炴敹閲戦(灏忚)
+ reportFeeMonthStatisticsPrepaymentTotal.setAllOweAmount("0.0"); //娆犺垂閲戦(灏忚)
+ }
+ //鏌ヨ浼樻儬銆佽繚绾﹂噾棰�(灏忚)
+ if (reportFeeMonthStatisticsPrepaymentDto.getPage() == 0) {
+ reportFeeMonthStatisticsPrepaymentDto.setPage(1);
+ }
+ List<ReportFeeMonthStatisticsPrepaymentDto> reportFeeMonthStatisticsPrepayments = reportFeeMonthStatisticsPrepaymentInnerServiceSMOImpl.queryAllPrepaymentDiscounts(reportFeeMonthStatisticsPrepaymentDto);
+ if (reportFeeMonthStatisticsPrepayments != null && reportFeeMonthStatisticsPrepayments.size() > 0) {
+ for (ReportFeeMonthStatisticsPrepaymentDto feeMonthStatisticsPrepayment : reportFeeMonthStatisticsPrepayments) {
+ //鑾峰彇鎶樻墸绫诲瀷
+ String discountSmallType = feeMonthStatisticsPrepayment.getDiscountSmallType();
+ //鑾峰彇鎶樻墸閲戦
+ String discountPrice = feeMonthStatisticsPrepayment.getDiscountPrice();
+ // discountSmallType 1: 鎵撴姌 2:鍑忓厤 3:婊炵撼閲� 4:绌虹疆鎴挎墦鎶� 5:绌虹疆鎴垮噺鍏� 6:璧犻��
+ //浼樻儬閲戦(灏忚)
+ if (!StringUtil.isEmpty(discountPrice) && !StringUtil.isEmpty(discountSmallType) && discountSmallType.equals("1")) {
+ reportFeeMonthStatisticsPrepaymentTotal.setTotalPreferentialAmount(discountPrice); //浼樻儬閲戦(灏忚)
+ }
+ //鍑忓厤閲戦(灏忚)
+ if (!StringUtil.isEmpty(discountPrice) && !StringUtil.isEmpty(discountSmallType) && discountSmallType.equals("2")) {
+ reportFeeMonthStatisticsPrepaymentTotal.setTotalDeductionAmount(discountPrice); //鍑忓厤閲戦(灏忚)
+ }
+ //婊炵撼閲�(灏忚)
+ if (!StringUtil.isEmpty(discountPrice) && !StringUtil.isEmpty(discountSmallType) && discountSmallType.equals("3")) {
+ reportFeeMonthStatisticsPrepaymentTotal.setTotalLateFee(discountPrice); //婊炵撼閲�(灏忚)
+ }
+ //绌虹疆鎴挎墦鎶橀噾棰�(灏忚)
+ if (!StringUtil.isEmpty(discountPrice) && !StringUtil.isEmpty(discountSmallType) && discountSmallType.equals("4")) {
+ reportFeeMonthStatisticsPrepaymentTotal.setTotalVacantHousingDiscount(discountPrice); //绌虹疆鎴挎墦鎶橀噾棰�(灏忚)
+ }
+ //绌虹疆鎴垮噺鍏嶉噾棰�(灏忚)
+ if (!StringUtil.isEmpty(discountPrice) && !StringUtil.isEmpty(discountSmallType) && discountSmallType.equals("5")) {
+ reportFeeMonthStatisticsPrepaymentTotal.setTotalVacantHousingReduction(discountPrice); //绌虹疆鎴垮噺鍏嶉噾棰�(灏忚)
+ }
+ //璧犻�侀噾棰�(灏忚)
+ if (!StringUtil.isEmpty(discountPrice) && !StringUtil.isEmpty(discountSmallType) && discountSmallType.equals("6")) {
+ reportFeeMonthStatisticsPrepaymentTotal.setTotalGiftAmount(discountPrice); //璧犻�侀噾棰�(灏忚)
+ }
+ }
+ } else {
+ reportFeeMonthStatisticsPrepaymentTotal.setTotalPreferentialAmount("0.0"); //浼樻儬閲戦(灏忚)
+ reportFeeMonthStatisticsPrepaymentTotal.setTotalDeductionAmount("0.0"); //鍑忓厤閲戦(灏忚)
+ reportFeeMonthStatisticsPrepaymentTotal.setTotalLateFee("0.0"); //婊炵撼閲�(灏忚)
+ reportFeeMonthStatisticsPrepaymentTotal.setTotalVacantHousingDiscount("0.0"); //绌虹疆鎴挎墦鎶橀噾棰�(灏忚)
+ reportFeeMonthStatisticsPrepaymentTotal.setTotalVacantHousingReduction("0.0"); //绌虹疆鎴垮噺鍏嶉噾棰�(灏忚)
+ reportFeeMonthStatisticsPrepaymentTotal.setTotalGiftAmount("0.0"); //璧犻�侀噾棰�(灏忚)
+ }
+ //鏌ヨ浼樻儬銆佽繚绾﹂噾棰�(澶ц)
+ reportFeeMonthStatisticsPrepaymentDto.setPage(PageDto.DEFAULT_PAGE);
+ List<ReportFeeMonthStatisticsPrepaymentDto> reportFeeMonthStatisticsPrepaymentDtos = reportFeeMonthStatisticsPrepaymentInnerServiceSMOImpl.queryAllPrepaymentDiscounts(reportFeeMonthStatisticsPrepaymentDto);
+ if (reportFeeMonthStatisticsPrepaymentDtos != null && reportFeeMonthStatisticsPrepaymentDtos.size() > 0) {
+ for (ReportFeeMonthStatisticsPrepaymentDto feeMonthStatisticsPrepaymentDto : reportFeeMonthStatisticsPrepaymentDtos) {
+ //鑾峰彇鎶樻墸绫诲瀷
+ String discountSmallType = feeMonthStatisticsPrepaymentDto.getDiscountSmallType();
+ //鑾峰彇鎶樻墸閲戦
+ String discountPrice = feeMonthStatisticsPrepaymentDto.getDiscountPrice();
+ // discountSmallType 1: 鎵撴姌 2:鍑忓厤 3:婊炵撼閲� 4:绌虹疆鎴挎墦鎶� 5:绌虹疆鎴垮噺鍏� 6:璧犻��
+ //浼樻儬閲戦(澶ц)
+ if (!StringUtil.isEmpty(discountPrice) && !StringUtil.isEmpty(discountSmallType) && discountSmallType.equals("1")) {
+ reportFeeMonthStatisticsPrepaymentTotal.setAllPreferentialAmount(discountPrice); //浼樻儬閲戦(澶ц)
+ }
+ //鍑忓厤閲戦(澶ц)
+ if (!StringUtil.isEmpty(discountPrice) && !StringUtil.isEmpty(discountSmallType) && discountSmallType.equals("2")) {
+ reportFeeMonthStatisticsPrepaymentTotal.setAllDeductionAmount(discountPrice); //鍑忓厤閲戦(澶ц)
+ }
+ //婊炵撼閲�(澶ц)
+ if (!StringUtil.isEmpty(discountPrice) && !StringUtil.isEmpty(discountSmallType) && discountSmallType.equals("3")) {
+ reportFeeMonthStatisticsPrepaymentTotal.setAllLateFee(discountPrice); //婊炵撼閲�(澶ц)
+ }
+ //绌虹疆鎴挎墦鎶橀噾棰�(澶ц)
+ if (!StringUtil.isEmpty(discountPrice) && !StringUtil.isEmpty(discountSmallType) && discountSmallType.equals("4")) {
+ reportFeeMonthStatisticsPrepaymentTotal.setAllVacantHousingDiscount(discountPrice); //绌虹疆鎴挎墦鎶橀噾棰�(澶ц)
+ }
+ //绌虹疆鎴垮噺鍏嶉噾棰�(澶ц)
+ if (!StringUtil.isEmpty(discountPrice) && !StringUtil.isEmpty(discountSmallType) && discountSmallType.equals("5")) {
+ reportFeeMonthStatisticsPrepaymentTotal.setAllVacantHousingReduction(discountPrice); //绌虹疆鎴垮噺鍏嶉噾棰�(澶ц)
+ }
+ //璧犻�侀噾棰�(澶ц)
+ if (!StringUtil.isEmpty(discountPrice) && !StringUtil.isEmpty(discountSmallType) && discountSmallType.equals("6")) {
+ reportFeeMonthStatisticsPrepaymentTotal.setAllGiftAmount(discountPrice); //璧犻�侀噾棰�(澶ц)
+ }
+ }
+ } else {
+ reportFeeMonthStatisticsPrepaymentTotal.setAllPreferentialAmount("0.0"); //浼樻儬閲戦(澶ц)
+ reportFeeMonthStatisticsPrepaymentTotal.setAllDeductionAmount("0.0"); //鍑忓厤閲戦(澶ц)
+ reportFeeMonthStatisticsPrepaymentTotal.setAllLateFee("0.0"); //婊炵撼閲�(澶ц)
+ reportFeeMonthStatisticsPrepaymentTotal.setAllVacantHousingDiscount("0.0"); //绌虹疆鎴挎墦鎶橀噾棰�(澶ц)
+ reportFeeMonthStatisticsPrepaymentTotal.setAllVacantHousingReduction("0.0"); //绌虹疆鎴垮噺鍏嶉噾棰�(澶ц)
+ reportFeeMonthStatisticsPrepaymentTotal.setAllGiftAmount("0.0"); //璧犻�侀噾棰�(澶ц)
+ }
+ return reportFeeMonthStatisticsPrepaymentTotal;
+ }
+
/**
* @param ownerIds
* @param reportFeeMonthStatisticsDtos
*/
private void refreshReportFeeMonthStatistics(List<String> ownerIds, List<ReportFeeMonthStatisticsDto> reportFeeMonthStatisticsDtos) {
-
if (ownerIds == null || ownerIds.size() < 1) {
return;
}
-
OwnerDto ownerDto = new OwnerDto();
ownerDto.setOwnerIds(ownerIds.toArray(new String[ownerIds.size()]));
List<OwnerDto> ownerDtos = reportFeeMonthStatisticsInnerServiceSMOImpl.queryRoomAndParkingSpace(ownerDto);
@@ -389,7 +882,6 @@
}
}
}
-
private boolean hasInReportListAndMerge(List<ReportFeeMonthStatisticsDto> reportList, ReportFeeMonthStatisticsDto reportFeeMonthStatistics) {
for (ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto : reportList) {
--
Gitblit v1.8.0