From 0e0e1f080d4a986ca75cde7cf5d23b2f8539fb10 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 17 五月 2023 12:25:35 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-report/src/main/java/com/java110/report/dao/impl/ReportFeeStatisticsServiceDaoImpl.java |   84 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 78 insertions(+), 6 deletions(-)

diff --git a/service-report/src/main/java/com/java110/report/dao/impl/ReportFeeStatisticsServiceDaoImpl.java b/service-report/src/main/java/com/java110/report/dao/impl/ReportFeeStatisticsServiceDaoImpl.java
index 9a72491..af3e98c 100644
--- a/service-report/src/main/java/com/java110/report/dao/impl/ReportFeeStatisticsServiceDaoImpl.java
+++ b/service-report/src/main/java/com/java110/report/dao/impl/ReportFeeStatisticsServiceDaoImpl.java
@@ -32,7 +32,7 @@
 
         List<Map> infos = sqlSessionTemplate.selectList("reportFeeStatisticsServiceDaoImpl.getHisMonthOweFee", info);
 
-        if (infos.size() < 1) {
+        if (infos == null || infos.size() < 1) {
             return 0;
         }
 
@@ -45,12 +45,26 @@
 
         List<Map> infos = sqlSessionTemplate.selectList("reportFeeStatisticsServiceDaoImpl.getCurMonthOweFee", info);
 
-        if (infos.size() < 1) {
+        if (infos == null || infos.size() < 1) {
             return 0;
         }
 
         return Double.parseDouble(infos.get(0).get("curOweFee").toString());
     }
+
+    @Override
+    public double getCurReceivableFee(Map info) {
+        logger.debug("鏌ヨ鍗曟湀娆犺垂 鍏ュ弬 info : {}", JSONObject.toJSONString(info));
+
+        List<Map> infos = sqlSessionTemplate.selectList("reportFeeStatisticsServiceDaoImpl.getCurReceivableFee", info);
+
+        if (infos == null || infos.size() < 1) {
+            return 0;
+        }
+
+        return Double.parseDouble(infos.get(0).get("curReceivableFee").toString());
+    }
+
 
     /**
      * 鏌ヨ娆犺垂杩藉洖
@@ -63,7 +77,7 @@
 
         List<Map> infos = sqlSessionTemplate.selectList("reportFeeStatisticsServiceDaoImpl.getHisReceivedFee", info);
 
-        if (infos.size() < 1) {
+        if (infos == null || infos.size() < 1) {
             return 0;
         }
 
@@ -81,7 +95,7 @@
 
         List<Map> infos = sqlSessionTemplate.selectList("reportFeeStatisticsServiceDaoImpl.getPreReceivedFee", info);
 
-        if (infos.size() < 1) {
+        if (infos == null || infos.size() < 1) {
             return 0;
         }
 
@@ -99,7 +113,7 @@
 
         List<Map> infos = sqlSessionTemplate.selectList("reportFeeStatisticsServiceDaoImpl.getReceivedFee", info);
 
-        if (infos.size() < 1) {
+        if (infos == null || infos.size() < 1) {
             return 0;
         }
 
@@ -112,11 +126,69 @@
 
         List<Map> infos = sqlSessionTemplate.selectList("reportFeeStatisticsServiceDaoImpl.getOweRoomCount", info);
 
-        if (infos.size() < 1) {
+        if (infos == null || infos.size() < 1) {
             return 0;
         }
 
         return Integer.parseInt(infos.get(0).get("oweRoomCount").toString());
     }
 
+
+    @Override
+    public int getFeeRoomCount(Map info) {
+        logger.debug("鏌ヨ 鏀惰垂鎴锋暟 鍏ュ弬 info : {}", JSONObject.toJSONString(info));
+
+        List<Map> infos = sqlSessionTemplate.selectList("reportFeeStatisticsServiceDaoImpl.getFeeRoomCount", info);
+
+        if (infos == null || infos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(infos.get(0).get("feeRoomCount").toString());
+    }
+
+    @Override
+    public List<Map> getFloorFeeSummary(Map info) {
+        logger.debug("鏌ヨ 妤兼爧鏀惰垂鐜� 鍏ュ弬 info : {}", JSONObject.toJSONString(info));
+
+        List<Map> infos = sqlSessionTemplate.selectList("reportFeeStatisticsServiceDaoImpl.getFloorFeeSummary", info);
+
+
+        return infos;
+    }
+
+    @Override
+    public List<Map> getConfigFeeSummary(Map info) {
+        logger.debug("鏌ヨ 璐圭敤椤规敹璐圭巼 鍏ュ弬 info : {}", JSONObject.toJSONString(info));
+
+        List<Map> infos = sqlSessionTemplate.selectList("reportFeeStatisticsServiceDaoImpl.getConfigFeeSummary", info);
+
+
+        return infos;
+    }
+
+    @Override
+    public int getObjFeeSummaryCount(Map info) {
+        logger.debug("鏌ヨ 鏀惰垂鎴锋暟 鍏ュ弬 info : {}", JSONObject.toJSONString(info));
+
+        List<Map> infos = sqlSessionTemplate.selectList("reportFeeStatisticsServiceDaoImpl.getObjFeeSummaryCount", info);
+
+        if (infos == null || infos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(infos.get(0).get("total").toString());
+    }
+
+    @Override
+    public List<Map> getObjFeeSummary(Map info) {
+        logger.debug("鏌ヨ 璐圭敤椤规敹璐圭巼 鍏ュ弬 info : {}", JSONObject.toJSONString(info));
+
+        List<Map> infos = sqlSessionTemplate.selectList("reportFeeStatisticsServiceDaoImpl.getObjFeeSummary", info);
+
+
+        return infos;
+    }
+
+
 }

--
Gitblit v1.8.0