From df3192f4e98377526d098928a9910c03e836c630 Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期五, 06 八月 2021 22:02:36 +0800
Subject: [PATCH] 优化戴拿
---
service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeYearStatisticsInnerServiceSMOImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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
old mode 100644
new mode 100755
index 3d95ff6..bfd7cbc
--- 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
@@ -173,7 +173,7 @@
reportFeeDto.setPayerObjId(tmpReportCarDto.getCarId());
reportFeeDto.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_CAR);
//reportFeeDto.setState(FeeDto.STATE_DOING);
- reportFeeDto.setFeeFlag(FeeDto.FEE_FLAG_CYCLE);
+ //reportFeeDto.setFeeFlag(FeeDto.FEE_FLAG_CYCLE);
List<ReportFeeDto> feeDtos = reportFeeServiceDaoImpl.getFees(reportFeeDto);
if (feeDtos == null || feeDtos.size() < 1) {
@@ -195,7 +195,7 @@
reportFeeYearCollectionDto.setCommunityId(tmpReportCarDto.getCommunityId());
reportFeeYearCollectionDto.setConfigId(tmpReportFeeDto.getConfigId());
reportFeeYearCollectionDto.setObjId(tmpReportFeeDto.getPayerObjId());
- reportFeeYearCollectionDto.setFeeId(tmpReportFeeDto.getFeeId());
+ //reportFeeYearCollectionDto.setFeeId(tmpReportFeeDto.getFeeId());
reportFeeYearCollectionDto.setObjType(tmpReportFeeDto.getPayerObjType());
List<ReportFeeYearCollectionDto> statistics = BeanConvertUtil.covertBeanList(
reportFeeYearCollectionServiceDaoImpl.getReportFeeYearCollectionInfo(BeanConvertUtil.beanCovertMap(reportFeeYearCollectionDto)),
@@ -230,7 +230,7 @@
Calendar configEndTime = Calendar.getInstance();
configStartTime.setTime(tmpReportFeeDto.getConfigEndTime());
int endYear = configEndTime.get(Calendar.YEAR);
- int curYear = Calendar.getInstance().get(Calendar.YEAR);
+ int curYear = Calendar.getInstance().get(Calendar.YEAR)+1;
double feePrice = computeFeeSMOImpl.getReportFeePrice(tmpReportFeeDto, null, tmpReportCarDto);
tmpReportFeeDto.setFeePrice(feePrice);
@@ -322,7 +322,7 @@
int endYear = configEndTime.get(Calendar.YEAR);
//褰撳墠骞�
- int curYear = Calendar.getInstance().get(Calendar.YEAR);
+ int curYear = Calendar.getInstance().get(Calendar.YEAR)+1;
double feePrice = computeFeeSMOImpl.getReportFeePrice(tmpReportFeeDto, reportRoomDto, null);
tmpReportFeeDto.setFeePrice(feePrice);
--
Gitblit v1.8.0