From 0ed29a9b6e7cdeeea5f736d5cbe196849b4f22f7 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期三, 19 七月 2023 09:40:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xinghong-dev
---
service-report/src/main/java/com/java110/report/smo/impl/QueryPayFeeDetailInnerServiceSMOImpl.java | 12 ------------
1 files changed, 0 insertions(+), 12 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 b05d40a..db538d8 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
@@ -65,10 +65,6 @@
List<ReportFeeMonthStatisticsDto> reportFeeMonthStatisticsDtos = null;
ReportFeeMonthStatisticsTotalDto reportFeeMonthStatisticsTotalDto = new ReportFeeMonthStatisticsTotalDto();
List<ReportFeeMonthStatisticsDto> reportList = new ArrayList<>();
- //鏌ヨ璇ュ皬鍖轰笅鐨勮垂鐢ㄩ」鐩�
- FeeConfigDto feeConfigDto = new FeeConfigDto();
- feeConfigDto.setCommunityId(reportFeeMonthStatisticsDto.getCommunityId());
- List<FeeConfigDto> feeConfigDtos = reportFeeMonthStatisticsInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
//搴旀敹鎬婚噾棰�(澶ц)
Double allReceivableAmount = 0.0;
//瀹炴敹閲戦(澶ц)
@@ -154,12 +150,6 @@
Double totalLateFee = 0.0;
List<String> ownerIds = new ArrayList<>();
for (ReportFeeMonthStatisticsDto reportFeeMonthStatistics : reportFeeMonthStatisticsDtos) {
-// FeeDetailDto feeDetailDto = new FeeDetailDto();
-// feeDetailDto.setDetailId(reportFeeMonthStatistics.getDetailId());
-// List<FeeDetailDto> feeDetailDtos = feeDetailInnerServiceSMOImpl.queryFeeDetails(feeDetailDto);
-// Assert.listOnlyOne(feeDetailDtos, "鏌ヨ璐圭敤鏄庣粏琛ㄩ敊璇�");
-// reportFeeMonthStatistics.setReceivableAmount(feeDetailDtos.get(0).getReceivableAmount());
-// reportFeeMonthStatistics.setPayableAmount(feeDetailDtos.get(0).getPayableAmount());
//搴旀敹閲戦
Double receivableAmount = Double.valueOf(reportFeeMonthStatistics.getReceivableAmount());
//瀹炴敹閲戦
@@ -251,8 +241,6 @@
if (!StringUtil.isEmpty(reportFeeMonthStatistics.getImportFeeName())) {
reportFeeMonthStatistics.setFeeName(reportFeeMonthStatistics.getImportFeeName());
}
- //璐圭敤椤圭洰
- reportFeeMonthStatistics.setFeeConfigDtos(feeConfigDtos);
if (!StringUtil.isEmpty(reportFeeMonthStatistics.getRepairId())) {
RepairDto repairDto = new RepairDto();
repairDto.setRepairId(reportFeeMonthStatistics.getRepairId());
--
Gitblit v1.8.0