From 3066c7757f70878e8c495421de5de33e0f612fba Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期二, 19 八月 2025 09:34:49 +0800
Subject: [PATCH] 合并0819
---
service-fee/src/main/java/com/java110/fee/cmd/fee/ReportFeeCmd.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 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 0ba2831..9f2bdfe 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
@@ -62,28 +62,32 @@
dictDto.setTableColumns("fee_type_cd");
List<DictDto> dictDtos = dictV1InnerServiceSMOImpl.queryDicts(dictDto);
int doYear = endYear - startYear;
- List<FeeDto> reportFeeDtos = new ArrayList<>();
- for (int i = startYear; i <= endYear; i++) {
- for (Map map : result) {
- if (map.get("缁熻鍛ㄦ湡")!=null&&map.get("缁熻鍛ㄦ湡").equals(i)){
+ List<List<FeeDto>> reportFeeDtoLists = new ArrayList<>();
+ for (DictDto dictDto1 : dictDtos) {//绫诲瀷
+ List<FeeDto> reportFeeDtos = new ArrayList<>();
+ for (int i = startYear; i <= endYear; i++) {
+ for (Map map : result) {
FeeDto feeDto = new FeeDto();
- feeDto.setCurYear((i)+"");
- feeDto.setFeeTypeCdName(map.get("璐圭敤绫诲瀷鍚嶇О")+"");
- double[] doubles = new double[doYear];
- for (int j = startYear ; j <= endYear ; j++) {
- if(map.get((j)+"骞存敹璐归噾棰�(鍏�)")!=null){
- doubles[j-startYear] = ((BigDecimal)map.get((j)+"骞存敹璐归噾棰�(鍏�)")).doubleValue();
+ if (map.get("缁熻鍛ㄦ湡")!=null&&map.get("缁熻鍛ㄦ湡").equals(i)&&map.get("璐圭敤绫诲瀷缂栫爜").equals(dictDto1.getStatusCd())){
+ feeDto.setCurYear((i)+"");
+ feeDto.setFeeTypeCdName(map.get("璐圭敤绫诲瀷鍚嶇О")+"");
+ double[] doubles = new double[doYear];
+ for (int j = startYear ; j <= endYear ; j++) {
+ if(map.get((j)+"骞存敹璐归噾棰�(鍏�)")!=null){
+ doubles[j-startYear] = ((BigDecimal)map.get((j)+"骞存敹璐归噾棰�(鍏�)")).doubleValue();
+ }
}
+ feeDto.setReport(doubles);
}
- feeDto.setReport(doubles);
reportFeeDtos.add(feeDto);
}
}
+ reportFeeDtoLists.add(reportFeeDtos);
}
- ResultVo resultVo = new ResultVo(reportFeeDtos);
+ ResultVo resultVo = new ResultVo(reportFeeDtoLists);
ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
--
Gitblit v1.8.0