From 212aa4ae1f54fe4d3e51b9695224f9f86cd1bd22 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 11 七月 2023 10:58:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-report/src/main/java/com/java110/report/cmd/dataReport/QueryReceivedStatisticsCmd.java | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryReceivedStatisticsCmd.java b/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryReceivedStatisticsCmd.java
index b8fd124..5cfee16 100644
--- a/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryReceivedStatisticsCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryReceivedStatisticsCmd.java
@@ -1,12 +1,10 @@
package com.java110.report.cmd.dataReport;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.dto.RoomDto;
import com.java110.dto.report.QueryStatisticsDto;
import com.java110.report.statistics.IFeeStatistics;
import com.java110.utils.exception.CmdException;
@@ -14,13 +12,10 @@
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
import java.math.BigDecimal;
import java.text.ParseException;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -84,8 +79,9 @@
return new ArrayList<>();
}
- BigDecimal receivedFee = new BigDecimal(0.00);
+ BigDecimal receivedFee = null;
for (Map tmpData : tmpDatas) {
+ receivedFee = new BigDecimal(0.00);
for (Map data : datas) {
if (!data.get("floorId").toString().equals(tmpData.get("floorId"))) {
continue;
--
Gitblit v1.8.0