From c7255cb752c12bf5c0c5e2b8bac0ad82d4cdf71b Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期二, 19 八月 2025 19:34:09 +0800
Subject: [PATCH] 费用报表0819
---
service-fee/src/main/java/com/java110/fee/cmd/fee/ReportFeeCmd.java | 103 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 72 insertions(+), 31 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 bf887e5..a1c4c89 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
@@ -22,10 +22,7 @@
import java.math.BigDecimal;
import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@Java110Cmd(serviceCode = "fee.reportFeeCmd")
public class ReportFeeCmd extends Cmd {
@@ -56,49 +53,93 @@
int currentYear = java.time.Year.now().getValue();
feeQueryParams.setEndYear(currentYear + 2);
int endYear = feeQueryParams.getEndYear();
+
List<Map> result = reportFeeInnerServiceSMOImpl.repostPaidInFee(feeQueryParams);
+ List<Map> resultTwo = reportFeeInnerServiceSMOImpl.repostPaidInFeeTwo(feeQueryParams);
DictDto dictDto = new DictDto();
dictDto.setTableName("pay_fee_config");
dictDto.setTableColumns("fee_type_cd");
List<DictDto> dictDtos = dictV1InnerServiceSMOImpl.queryDicts(dictDto);
int doYear = endYear - startYear;
- List<List<FeeDto>> reportFeeDtoLists = new ArrayList<>();
+ List<List<FeeDto>> reportFeeDtoLists = new LinkedList<>();
+ reportFeeDtoLists.add(new LinkedList<FeeDto>());
+ reportFeeDtoLists.add(new LinkedList<FeeDto>());
+ reportFeeDtoLists.add(new LinkedList<FeeDto>());
+ reportFeeDtoLists.add(new LinkedList<FeeDto>());
+ int ind = 1;
for (DictDto dictDto1 : dictDtos) {//绫诲瀷
- List<FeeDto> reportFeeDtos = new ArrayList<>();
- for (int i = startYear; i <= endYear; i++) {
- for (Map map : result) {
- FeeDto feeDto = new FeeDto();
- 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();
+ List<FeeDto> reportFeeDtos = new LinkedList<>();
+ FeeDto feeDto = new FeeDto();
+ LinkedList<FeeDto> feeDtos = new LinkedList<>();
+ reportFeeDtoLists.add(feeDtos);
+ for (int i = startYear; i <= endYear; i++) {//骞翠唤
+ double[] doubles = new double[doYear+12+1+5];
+ feeDto = new FeeDto();
+ //0~5
+ if(resultTwo != null){
+ for (Map map : resultTwo) {
+ if(map.isEmpty()){
+ break;
+ }
+ else if (map.get("缁熻鍛ㄦ湡")!=null&&map.get("缁熻鍛ㄦ湡").equals(i)&&map.get("璐圭敤绫诲瀷缂栫爜").equals(dictDto1.getStatusCd())){
+ feeDto.setCurYear((i)+"");
+ feeDto.setFeeTypeCdName(map.get("璐圭敤绫诲瀷")+"");
+ doubles[0] = map.get("褰撳勾搴旂即鎬婚噾棰�") == null ? 0 : (double) map.get("褰撳勾搴旂即鎬婚噾棰�");
+ doubles[1] = map.get("姣忔湀璐圭敤锛堝悎璁�/鏈堜唤鏁帮級") == null ? 0 : (double) map.get("姣忔湀璐圭敤锛堝悎璁�/鏈堜唤鏁帮級");
+ doubles[2] = map.get("姣忔湀璐圭敤鏈堜唤鏁�") == null ? 0 : ((Long) map.get("姣忔湀璐圭敤鏈堜唤鏁�")).intValue();
+ }
+ }
+ }
+
+ if(result != null){
+ for (Map map : result) {//绫诲瀷+骞翠唤
+ if(map.isEmpty()){
+ break;
+ }
+ //5 ~ 25
+ else if (map.get("缁熻鍛ㄦ湡")!=null&&map.get("缁熻鍛ㄦ湡").equals(i)&&map.get("璐圭敤绫诲瀷缂栫爜").equals(dictDto1.getStatusCd())){
+
+ for (int j = startYear ; j <= endYear ; j++) {// 5~(endYear - startYear + 5) = 5 ~ 13
+ if(map.get((j)+"骞存敹璐归噾棰�(鍏�)")!=null){
+ feeDto.setCurYear((i)+"");
+ feeDto.setFeeTypeCdName(map.get("璐圭敤绫诲瀷鍚嶇О") == null ? null : map.get("璐圭敤绫诲瀷鍚嶇О")+"");
+ doubles[j-startYear+5] = ((BigDecimal)map.get((j)+"骞存敹璐归噾棰�(鍏�)")).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+ }
+ for (int x = 1 ;x <= 12 ;x++ ){// (endYear - startYear + 6) ~ (endYear - startYear + 6 + 12) = 13 ~ 25
+ if (map.get((currentYear)+"骞�"+x+"鏈堟敹璐归噾棰�(鍏�)")!=null){
+ feeDto.setCurYear((i)+"");
+ feeDto.setFeeTypeCdName(map.get("璐圭敤绫诲瀷鍚嶇О") == null ? null : map.get("璐圭敤绫诲瀷鍚嶇О")+"");
+ doubles[endYear - startYear + x +5] = ((BigDecimal)map.get((currentYear)+"骞�"+x+"鏈堟敹璐归噾棰�(鍏�)")).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+ }
+ }
}
}
- feeDto.setReport(doubles);
- reportFeeDtos.add(feeDto);
}
-// if(startYear == currentYear){
-// for (int x = 1 ; x <= 12 ; x++){
-// feeDto = new FeeDto();
-// feeDto.setCurYear(startYear+"/"+x);
-// feeDto.setFeeTypeCdName(dictDto1.getName());
-// if(map.get(startYear + "骞�" + x + "鏈堟敹璐归噾棰�(鍏�)")!=null){
-// d
-// }
-// }
-// }
-
+ }
+ if(feeDto.getCurYear() != null){
+ feeDto.setReport(doubles);
+ reportFeeDtos.add(feeDto);
}
}
+ if (ind == 3 || ind == 7){
+ reportFeeDtoLists.add(new LinkedList<>());
+ }
reportFeeDtoLists.add(reportFeeDtos);
+ if(ind == 1 || ind == 2){
+ reportFeeDtoLists.add(new LinkedList<>());
+ }
+ ind ++;
}
+ int[] arr = new int[endYear - startYear + 1];
+ for (int i = startYear; i <= endYear; i++) {
+ arr[i-startYear] = i;
+ }
+ FeeDto feeDto = new FeeDto();
+ feeDto.setRepostList(reportFeeDtoLists);
+ feeDto.setYearArr(arr);
-
- ResultVo resultVo = new ResultVo(reportFeeDtoLists);
+ ResultVo resultVo = new ResultVo(feeDto);
ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
--
Gitblit v1.8.0