From e52ddfe8caf7d0027950033a5aff2a1fd3482e9d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 01 六月 2022 17:50:25 +0800
Subject: [PATCH] 优化装修 跟踪记录 回显
---
service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeYearStatisticsInnerServiceSMOImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 bfd7cbc..36081cc 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
@@ -23,7 +23,7 @@
import com.java110.utils.cache.CommonCache;
import com.java110.utils.util.*;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.RequestBody;
@@ -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)+1;
+ 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)+1;
+ int curYear = Calendar.getInstance().get(Calendar.YEAR) + 1;
double feePrice = computeFeeSMOImpl.getReportFeePrice(tmpReportFeeDto, reportRoomDto, null);
tmpReportFeeDto.setFeePrice(feePrice);
@@ -399,6 +399,10 @@
int curYear = Calendar.getInstance().get(Calendar.YEAR);
double cycleMonth = 12;
+ if (FeeDto.FEE_FLAG_ONCE.equals(tmpReportFeeDto.getFeeFlag()) && FeeDto.STATE_DOING.equals(tmpReportFeeDto.getState())) { // 涓�娆℃�ц垂鐢� 璐圭敤娌℃湁缁撴潫
+ return StringUtil.isEmpty(tmpReportFeeDto.getAmount()) ? 0 : Double.parseDouble(tmpReportFeeDto.getAmount());
+ }
+
if (FeeDto.FEE_FLAG_ONCE.equals(tmpReportFeeDto.getFeeFlag())) { // 涓�娆℃�ц垂鐢ㄦ病鏈夊簲鏀� 鎵�浠ュ啓鎴�0
return 0;
}
--
Gitblit v1.8.0