From fb7bd4da57428b5f16b4f90729fe8f497585d327 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期二, 19 八月 2025 11:04:30 +0800
Subject: [PATCH] 合并0819

---
 service-fee/src/main/java/com/java110/fee/cmd/fee/ReportFeeCmd.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 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 795289a..bf887e5 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
@@ -78,19 +78,19 @@
                             }
                         }
                         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){
+//                    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
+//                            }
+//                        }
+//                    }
 
-                            }
-                        }
-                    }
-
-                    reportFeeDtos.add(feeDto);
                 }
             }
             reportFeeDtoLists.add(reportFeeDtos);

--
Gitblit v1.8.0