From c7ea3633e49e501c33f668fc08fab2ffc0e3c38c Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期一, 18 八月 2025 18:10:28 +0800
Subject: [PATCH] 暂存0815
---
service-fee/src/main/java/com/java110/fee/cmd/fee/ReportFeeCmd.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/ReportFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/ReportFeeCmd.java
index 2c4104a..686f5d2 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/ReportFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/ReportFeeCmd.java
@@ -8,14 +8,18 @@
import com.java110.dto.community.CommunityDto;
import com.java110.intf.community.ICommunityInnerServiceSMO;
import com.java110.intf.fee.IReportFeeInnerServiceSMO;
+import com.java110.po.fee.PayFeePo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.vo.FeeQueryParams;
+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.List;
import java.util.Map;
@@ -35,13 +39,28 @@
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+ int startYear = 2020;
CommunityDto communityDto = new CommunityDto();
communityDto.setCommunityId(reqJson.getString("communityId"));
List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
FeeQueryParams feeQueryParams = new FeeQueryParams();
feeQueryParams.setCommunityId(reqJson.getString("communityId"));
- feeQueryParams.setStartYear(communityDtos.get(0).getCreateTime().getYear());
+ feeQueryParams.setStartYear(startYear);
+ int currentYear = java.time.Year.now().getValue();
+ feeQueryParams.setEndYear(currentYear + 2);
List<Map> result = reportFeeInnerServiceSMOImpl.repostPaidInFee(feeQueryParams);
- context.setResponseEntity(new ResponseEntity<>(result, HttpStatus.OK));
+
+ int endYear = feeQueryParams.getEndYear();
+ double[][] reports = new double[22 * (endYear - startYear)][endYear - startYear + 1];
+ for(int j = 0 ; j < result.size() ; j++){
+ for (int i = startYear; i <= endYear; i++) {
+ reports[j][i-startYear] = (double) result.get(j).get(i+"骞存敹璐归噾棰�(鍏�)");
+ }
+ }
+ ResultVo resultVo = new ResultVo(reports);
+
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+ context.setResponseEntity(responseEntity);
}
}
--
Gitblit v1.8.0