From b173d31976fc4731b7c247d4038de92134eba317 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 29 六月 2023 11:42:17 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-report/src/main/java/com/java110/report/smo/impl/BaseDataStatisticsInnerServiceSMOImpl.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/smo/impl/BaseDataStatisticsInnerServiceSMOImpl.java b/service-report/src/main/java/com/java110/report/smo/impl/BaseDataStatisticsInnerServiceSMOImpl.java
index f67cc12..ade603e 100644
--- a/service-report/src/main/java/com/java110/report/smo/impl/BaseDataStatisticsInnerServiceSMOImpl.java
+++ b/service-report/src/main/java/com/java110/report/smo/impl/BaseDataStatisticsInnerServiceSMOImpl.java
@@ -3,8 +3,7 @@
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
-import com.java110.dto.RoomDto;
-import com.java110.dto.report.QueryStatisticsDto;
+import com.java110.dto.room.RoomDto;
import com.java110.intf.report.IBaseDataStatisticsInnerServiceSMO;
import com.java110.report.dao.IBaseDataStatisticsServiceDao;
import com.java110.utils.util.BeanConvertUtil;
@@ -34,30 +33,30 @@
/**
* 鏌ヨ鎴垮眿鎬绘暟
*
- * @param queryStatisticsDto 鏁版嵁瀵硅薄鍒嗕韩
+ * @param roomDto 鏁版嵁瀵硅薄鍒嗕韩
* @return
*/
@Override
- public double getRoomCount(@RequestBody QueryStatisticsDto queryStatisticsDto) {
- int info = baseDataStatisticsServiceDaoImpl.getRoomCount(BeanConvertUtil.beanCovertMap(queryStatisticsDto));
+ public long getRoomCount(@RequestBody RoomDto roomDto) {
+ int info = baseDataStatisticsServiceDaoImpl.getRoomCount(BeanConvertUtil.beanCovertMap(roomDto));
return info;
}
/**
* 鏌ヨ鎴垮眿淇℃伅
*
- * @param queryStatisticsDto 鏁版嵁瀵硅薄鍒嗕韩
+ * @param roomDto 鏁版嵁瀵硅薄鍒嗕韩
* @return
*/
@Override
- public List<RoomDto> getRoomInfo(@RequestBody QueryStatisticsDto queryStatisticsDto) {
- int page = queryStatisticsDto.getPage();
+ public List<RoomDto> getRoomInfo(@RequestBody RoomDto roomDto) {
+ int page = roomDto.getPage();
if (page != PageDto.DEFAULT_PAGE) {
- queryStatisticsDto.setPage((page - 1) * queryStatisticsDto.getRow());
+ roomDto.setPage((page - 1) * roomDto.getRow());
}
- List<Map> info = baseDataStatisticsServiceDaoImpl.getRoomInfo(BeanConvertUtil.beanCovertMap(queryStatisticsDto));
+ List<Map> info = baseDataStatisticsServiceDaoImpl.getRoomInfo(BeanConvertUtil.beanCovertMap(roomDto));
return BeanConvertUtil.covertBeanList(info, RoomDto.class);
}
}
--
Gitblit v1.8.0