From 35fb8082fde72fe5c6ed2b5fbd20b582949acbfe Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 26 八月 2021 15:41:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-report/src/main/java/com/java110/report/smo/impl/ReportFeeMonthStatisticsInnerServiceSMOImpl.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/smo/impl/ReportFeeMonthStatisticsInnerServiceSMOImpl.java b/service-report/src/main/java/com/java110/report/smo/impl/ReportFeeMonthStatisticsInnerServiceSMOImpl.java
index 1642c6d..a8d644f 100755
--- a/service-report/src/main/java/com/java110/report/smo/impl/ReportFeeMonthStatisticsInnerServiceSMOImpl.java
+++ b/service-report/src/main/java/com/java110/report/smo/impl/ReportFeeMonthStatisticsInnerServiceSMOImpl.java
@@ -489,7 +489,7 @@
if (page != PageDto.DEFAULT_PAGE) {
paramInfo.put("page",(page - 1) * (int)paramInfo.get("row"));
}
- List<Map> deposits = reportFeeMonthStatisticsServiceDaoImpl.queryHuaningPayFee(BeanConvertUtil.beanCovertMap(paramInfo));
+ List<Map> deposits = reportFeeMonthStatisticsServiceDaoImpl.queryHuaningPayFee(paramInfo);
return deposits;
}
@Override
@@ -504,7 +504,23 @@
if (page != PageDto.DEFAULT_PAGE) {
paramInfo.put("page",(page - 1) * (int)paramInfo.get("row"));
}
- List<Map> deposits = reportFeeMonthStatisticsServiceDaoImpl.queryHuaningPayFeeTwo(BeanConvertUtil.beanCovertMap(paramInfo));
+ List<Map> deposits = reportFeeMonthStatisticsServiceDaoImpl.queryHuaningPayFeeTwo(paramInfo);
+ return deposits;
+ }
+
+ @Override
+ public int queryHuaningOweFeeDetailCount(@RequestBody Map paramInfo) {
+ return reportFeeMonthStatisticsServiceDaoImpl.queryHuaningOweFeeDetailCount(paramInfo);
+ }
+
+ @Override
+ public List<Map> queryHuaningOweFeeDetail(@RequestBody Map paramInfo) {
+ int page = (int)paramInfo.get("page");
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ paramInfo.put("page",(page - 1) * (int)paramInfo.get("row"));
+ }
+ List<Map> deposits = reportFeeMonthStatisticsServiceDaoImpl.queryHuaningOweFeeDetail(paramInfo);
return deposits;
}
--
Gitblit v1.8.0