From 8a52084596fa59c005217d3e2edae35dac315002 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 24 七月 2021 13:08:13 +0800
Subject: [PATCH] 优化 查询用户名称错误bug
---
service-fee/src/main/java/com/java110/fee/bmo/feeManualCollectionDetail/impl/GetCollectionBMOImpl.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/feeManualCollectionDetail/impl/GetCollectionBMOImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/feeManualCollectionDetail/impl/GetCollectionBMOImpl.java
old mode 100644
new mode 100755
index 33a8281..fea6f2e
--- a/service-fee/src/main/java/com/java110/fee/bmo/feeManualCollectionDetail/impl/GetCollectionBMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/feeManualCollectionDetail/impl/GetCollectionBMOImpl.java
@@ -4,16 +4,18 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.feeManualCollection.FeeManualCollectionDto;
-import com.java110.dto.feeManualCollectionDetail.FeeManualCollectionDetailDto;
+import com.java110.dto.feeManualCollection.FeeManualCollectionDetailDto;
import com.java110.fee.bmo.feeManualCollectionDetail.IGetExportCollectionBMO;
-import com.java110.intf.IFeeManualCollectionDetailInnerServiceSMO;
+import com.java110.intf.fee.IFeeManualCollectionDetailInnerServiceSMO;
import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
import com.java110.intf.fee.IFeeManualCollectionInnerServiceSMO;
+import com.java110.utils.util.DateUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
import java.util.List;
@Service("getCollectionBMOImpl")
@@ -62,7 +64,7 @@
private void doDealDetail(FeeManualCollectionDto tmpFeeManualCollectionDto, List<FeeConfigDto> feeConfigDtos, JSONArray data) {
- JSONObject dataObj = new JSONObject();
+ JSONObject dataObj = new JSONObject(true);
List<FeeManualCollectionDetailDto> feeManualCollectionDetailDtos = null;
@@ -82,6 +84,7 @@
dataObj.put("鑱旂郴鐢佃瘽", tmpFeeManualCollectionDto.getLink());
dataObj.put("鏀惰垂闈㈢Н/m2", tmpFeeManualCollectionDto.getRoomArea());
+ BigDecimal totalFee = new BigDecimal(0);
for (FeeConfigDto feeConfigDto : feeConfigDtos) {
@@ -93,11 +96,18 @@
continue;
}
+ BigDecimal amount = new BigDecimal(tmpFeeManualCollectionDetailDto.getAmount());
+
+ totalFee = totalFee.add(amount);
+
dataObj.put(feeConfigDto.getFeeName(), tmpFeeManualCollectionDetailDto.getAmount());
dataObj.put(feeConfigDto.getFeeName() + "_璧锋鏃ユ湡",
- tmpFeeManualCollectionDetailDto.getStartTime() + "鑷�" + tmpFeeManualCollectionDetailDto.getEndTime());
+ DateUtil.dateTimeToDate(tmpFeeManualCollectionDetailDto.getStartTime())
+ + "鑷�" + DateUtil.dateTimeToDate(tmpFeeManualCollectionDetailDto.getEndTime()));
}
+ dataObj.put("搴斾氦娆炬�婚", totalFee.setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+
data.add(dataObj);
}
--
Gitblit v1.8.0