From dd6687b118561100e1677e88a9c2f5842a54c531 Mon Sep 17 00:00:00 2001
From: jialh <1972868360@qq.com>
Date: 星期四, 16 四月 2026 18:14:14 +0800
Subject: [PATCH] 水电话费

---
 service-fee/src/main/java/com/java110/fee/dao/impl/IReportFeeServiceDaoImpl.java |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/service-fee/src/main/java/com/java110/fee/dao/impl/IReportFeeServiceDaoImpl.java b/service-fee/src/main/java/com/java110/fee/dao/impl/IReportFeeServiceDaoImpl.java
index 84e7f2f..4b78818 100644
--- a/service-fee/src/main/java/com/java110/fee/dao/impl/IReportFeeServiceDaoImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/dao/impl/IReportFeeServiceDaoImpl.java
@@ -36,6 +36,7 @@
         params.put("monthList", monthList);
         params.put("endYear", feeQueryParams.getEndYear());
         params.put("yearList", yearList);
+        params.put("currentYear", feeQueryParams.getEndYear() - 2);
         return sqlSessionTemplate.selectList("reportFeeServiceDaoImpl.repostInFee", params);
     }
 
@@ -71,6 +72,25 @@
 
     @Override
     public List<Map> repostPaidInFeeByWhiteOrder(Map map) {
-        return sqlSessionTemplate.selectList("reportFeeServiceDaoImpl.repostPaidInFeeByWhiteOrder", map);
+        List<Map> objects = sqlSessionTemplate.selectList("reportFeeServiceDaoImpl.repostPaidInFeeByWhiteOrder", map);
+
+        if (objects.size() == 0){//娌℃湁鏁版嵁鏃�
+            objects.get(0).put("count",0);
+            return objects;
+        }
+        List<Map> businessOaWorkflowInfos = sqlSessionTemplate.selectList("reportFeeServiceDaoImpl.countRepostPaidInFeeByWhiteOrder",map);
+        if (businessOaWorkflowInfos.size() < 1) {
+            objects.get(0).put("count",0);
+        }
+        else {
+            objects.get(0).put("count",businessOaWorkflowInfos.get(0).get("count").toString());
+        }
+
+        return objects;
     }
+    @Override
+    public List<Map> onceRoomFee(Map map) {
+        return sqlSessionTemplate.selectList("reportFeeServiceDaoImpl.onceRoomFee", map);
+    }
+
 }

--
Gitblit v1.8.0