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/smo/impl/ReportFeeStatisticsInnerServiceSMOImpl.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/smo/impl/ReportFeeStatisticsInnerServiceSMOImpl.java b/service-report/src/main/java/com/java110/report/smo/impl/ReportFeeStatisticsInnerServiceSMOImpl.java
index 3aab77e..78c8991 100644
--- a/service-report/src/main/java/com/java110/report/smo/impl/ReportFeeStatisticsInnerServiceSMOImpl.java
+++ b/service-report/src/main/java/com/java110/report/smo/impl/ReportFeeStatisticsInnerServiceSMOImpl.java
@@ -2,6 +2,7 @@
import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.PageDto;
import com.java110.dto.report.QueryStatisticsDto;
import com.java110.intf.report.IReportFeeStatisticsInnerServiceSMO;
import com.java110.report.dao.IReportFeeStatisticsServiceDao;
@@ -106,7 +107,7 @@
* @return
*/
@Override
- public List<Map> getFloorFeeSummary(QueryStatisticsDto queryStatisticsDto) {
+ public List<Map> getFloorFeeSummary(@RequestBody QueryStatisticsDto queryStatisticsDto) {
List<Map> info = reportFeeStatisticsServiceDaoImpl.getFloorFeeSummary(BeanConvertUtil.beanCovertMap(queryStatisticsDto));
return info;
@@ -119,9 +120,29 @@
* @return
*/
@Override
- public List<Map> getConfigFeeSummary(QueryStatisticsDto queryStatisticsDto) {
+ public List<Map> getConfigFeeSummary(@RequestBody QueryStatisticsDto queryStatisticsDto) {
List<Map> info = reportFeeStatisticsServiceDaoImpl.getConfigFeeSummary(BeanConvertUtil.beanCovertMap(queryStatisticsDto));
return info;
}
+
+ @Override
+ public int getObjFeeSummaryCount(@RequestBody QueryStatisticsDto queryStatisticsDto) {
+ int info = reportFeeStatisticsServiceDaoImpl.getObjFeeSummaryCount(BeanConvertUtil.beanCovertMap(queryStatisticsDto));
+ return info;
+ }
+
+ @Override
+ public List<Map> getObjFeeSummary(@RequestBody QueryStatisticsDto queryStatisticsDto) {
+ //鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
+
+ int page = queryStatisticsDto.getPage();
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ queryStatisticsDto.setPage((page - 1) * queryStatisticsDto.getRow());
+ }
+
+ List<Map> info = reportFeeStatisticsServiceDaoImpl.getObjFeeSummary(BeanConvertUtil.beanCovertMap(queryStatisticsDto));
+ return info;
+ }
}
--
Gitblit v1.8.0