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/ReportCommunityInnerServiceSMOImpl.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/smo/impl/ReportCommunityInnerServiceSMOImpl.java b/service-report/src/main/java/com/java110/report/smo/impl/ReportCommunityInnerServiceSMOImpl.java
index f0b515d..47315c3 100644
--- a/service-report/src/main/java/com/java110/report/smo/impl/ReportCommunityInnerServiceSMOImpl.java
+++ b/service-report/src/main/java/com/java110/report/smo/impl/ReportCommunityInnerServiceSMOImpl.java
@@ -3,29 +3,22 @@
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
-import com.java110.dto.RoomDto;
+import com.java110.dto.room.RoomDto;
+import com.java110.dto.fee.FeeDto;
import com.java110.dto.owner.OwnerAttrDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.owner.OwnerDto;
-import com.java110.dto.ownerCarAttr.OwnerCarAttrDto;
-import com.java110.dto.reportOwnerPayFee.ReportOwnerPayFeeDto;
-import com.java110.dto.user.UserDto;
import com.java110.intf.report.IReportCommunityInnerServiceSMO;
-import com.java110.intf.report.IReportOwnerPayFeeInnerServiceSMO;
import com.java110.intf.user.IOwnerAttrInnerServiceSMO;
-import com.java110.po.reportOwnerPayFee.ReportOwnerPayFeePo;
import com.java110.report.dao.IReportCommunityServiceDao;
import com.java110.report.dao.IReportOwnerPayFeeServiceDao;
-import com.java110.utils.constant.StatusConstant;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
/**
* @ClassName FloorInnerServiceSMOImpl
@@ -94,12 +87,12 @@
}
@Override
- public int queryHisOwnerCount(OwnerDto ownerDto) {
+ public int queryHisOwnerCount(@RequestBody OwnerDto ownerDto) {
return reportCommunityServiceDaoImpl.queryHisOwnerCount(BeanConvertUtil.beanCovertMap(ownerDto));
}
@Override
- public List<OwnerDto> queryHisOwners(OwnerDto ownerDto) {
+ public List<OwnerDto> queryHisOwners(@RequestBody OwnerDto ownerDto) {
int page = ownerDto.getPage();
if (page != PageDto.DEFAULT_PAGE) {
@@ -127,6 +120,26 @@
return ownerDtos;
}
+ @Override
+ public int queryHisFeeCount(@RequestBody FeeDto feeDto) {
+ return reportCommunityServiceDaoImpl.queryHisFeeCount(BeanConvertUtil.beanCovertMap(feeDto));
+ }
+
+ @Override
+ public List<FeeDto> queryHisFees(@RequestBody FeeDto feeDto) {
+ int page = feeDto.getPage();
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ feeDto.setPage((page - 1) * feeDto.getRow());
+ }
+
+ List<FeeDto> feeDtos = BeanConvertUtil.covertBeanList(
+ reportCommunityServiceDaoImpl.queryHisFees(BeanConvertUtil.beanCovertMap(feeDto)),
+ FeeDto.class);
+
+ return feeDtos;
+ }
+
/**
* 鑾峰彇鎵归噺userId
*
--
Gitblit v1.8.0