From b8e7bb1791ff41be5ee8150cc46af082d7444a65 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 31 五月 2023 01:02:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeYearStatisticsInnerServiceSMOImpl.java | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeYearStatisticsInnerServiceSMOImpl.java b/service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeYearStatisticsInnerServiceSMOImpl.java
index fdd8f01..d419eb6 100755
--- a/service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeYearStatisticsInnerServiceSMOImpl.java
+++ b/service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeYearStatisticsInnerServiceSMOImpl.java
@@ -258,15 +258,17 @@
configStartTime.setTime(tmpReportFeeDto.getConfigEndTime());
int endYear = configEndTime.get(Calendar.YEAR);
int curYear = Calendar.getInstance().get(Calendar.YEAR) + 1;
- double feePrice = computeFeeSMOImpl.getReportFeePrice(tmpReportFeeDto, null, tmpReportCarDto);
- tmpReportFeeDto.setFeePrice(feePrice);
+
+ FeeDto feeDto = BeanConvertUtil.covertBean(tmpReportFeeDto, FeeDto.class);
+ //鍒峰叆娆犺垂閲戦
+ computeFeeSMOImpl.computeEveryOweFee(feeDto);
if (endYear > curYear) {
endYear = curYear;
}
for (int year = startYear; year <= endYear; year++) {
- computeYearFee(year, tmpReportFeeDto, reportFeeYearCollectionPo);
+ computeYearFee(year, feeDto, reportFeeYearCollectionPo);
}
}
@@ -351,15 +353,16 @@
//褰撳墠骞�
int curYear = Calendar.getInstance().get(Calendar.YEAR) + 1;
- double feePrice = computeFeeSMOImpl.getReportFeePrice(tmpReportFeeDto, reportRoomDto, null);
- tmpReportFeeDto.setFeePrice(feePrice);
+ FeeDto feeDto = BeanConvertUtil.covertBean(tmpReportFeeDto, FeeDto.class);
+ //鍒峰叆娆犺垂閲戦
+ computeFeeSMOImpl.computeEveryOweFee(feeDto);
if (endYear > curYear) {
endYear = curYear;
}
for (int year = startYear; year <= endYear; year++) {
- computeYearFee(year, tmpReportFeeDto, reportFeeYearCollectionPo);
+ computeYearFee(year, feeDto, reportFeeYearCollectionPo);
}
}
@@ -367,10 +370,10 @@
* 璁＄畻鎸囧畾骞寸殑鏁版嵁
*
* @param year
- * @param tmpReportFeeDto
+ * @param feeDto
* @param reportFeeYearCollectionPo
*/
- private void computeYearFee(int year, ReportFeeDto tmpReportFeeDto, ReportFeeYearCollectionPo reportFeeYearCollectionPo) {
+ private void computeYearFee(int year, FeeDto feeDto, ReportFeeYearCollectionPo reportFeeYearCollectionPo) {
int curYear = Calendar.getInstance().get(Calendar.YEAR);
ReportFeeYearCollectionDetailDto reportFeeYearCollectionDetailDto = new ReportFeeYearCollectionDetailDto();
@@ -382,13 +385,13 @@
= BeanConvertUtil.covertBeanList(reportFeeYearCollectionDetailServiceDaoImpl.getReportFeeYearCollectionDetailInfo(BeanConvertUtil.beanCovertMap(reportFeeYearCollectionDetailDto)),
ReportFeeYearCollectionDetailDto.class);
- if (!ListUtil.isNull(reportFeeYearCollectionDetailDtos) && year != curYear) { // 璇存槑宸茬粡澶勭悊杩囦簡 涓嶅啀澶勭悊
- return;
- }
+// if (!ListUtil.isNull(reportFeeYearCollectionDetailDtos) && year != curYear) { // 璇存槑宸茬粡澶勭悊杩囦簡 涓嶅啀澶勭悊
+// return;
+// }
- double receivableAmount = getReceivableAmount(tmpReportFeeDto);
+ double receivableAmount = feeDto.getFeePrice();
- double receivedAmount = getReceivedAmount(tmpReportFeeDto, year);
+ double receivedAmount = getReceivedAmount(feeDto, year);
ReportFeeYearCollectionDetailPo reportFeeYearCollectionDetailPo = null;
@@ -453,7 +456,7 @@
* @param tmpReportFeeDto
* @return
*/
- private double getReceivedAmount(ReportFeeDto tmpReportFeeDto, int year) {
+ private double getReceivedAmount(FeeDto tmpReportFeeDto, int year) {
ReportFeeDetailDto feeDetailDto = new ReportFeeDetailDto();
feeDetailDto.setConfigId(tmpReportFeeDto.getConfigId());
feeDetailDto.setPayerObjId(tmpReportFeeDto.getPayerObjId());
--
Gitblit v1.8.0