From 212aa4ae1f54fe4d3e51b9695224f9f86cd1bd22 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 11 七月 2023 10:58:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-report/src/main/java/com/java110/report/statistics/impl/BaseDataStatisticsImpl.java | 65 +++++++++++++++++++++++++++++++-
1 files changed, 63 insertions(+), 2 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/statistics/impl/BaseDataStatisticsImpl.java b/service-report/src/main/java/com/java110/report/statistics/impl/BaseDataStatisticsImpl.java
index 56a3342..d28f61c 100644
--- a/service-report/src/main/java/com/java110/report/statistics/impl/BaseDataStatisticsImpl.java
+++ b/service-report/src/main/java/com/java110/report/statistics/impl/BaseDataStatisticsImpl.java
@@ -1,13 +1,12 @@
package com.java110.report.statistics.impl;
-import com.java110.dto.RoomDto;
+import com.java110.dto.room.RoomDto;
import com.java110.dto.contract.ContractDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.dto.report.QueryStatisticsDto;
import com.java110.intf.community.IRoomV1InnerServiceSMO;
import com.java110.intf.report.IBaseDataStatisticsInnerServiceSMO;
-import com.java110.intf.report.IReportFeeStatisticsInnerServiceSMO;
import com.java110.intf.store.IContractInnerServiceSMO;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.intf.user.IOwnerV1InnerServiceSMO;
@@ -76,6 +75,66 @@
roomDto.setLink(queryStatisticsDto.getLink());
addRoomNumCondition(queryStatisticsDto, roomDto);
return baseDataStatisticsInnerServiceSMOImpl.getRoomInfo(roomDto);
+ }
+
+ @Override
+ public long getReceivedRoomCount(QueryStatisticsDto queryStatisticsDto) {
+ RoomDto roomDto = new RoomDto();
+ roomDto.setFloorId(queryStatisticsDto.getFloorId());
+ roomDto.setCommunityId(queryStatisticsDto.getCommunityId());
+ roomDto.setOwnerName(queryStatisticsDto.getOwnerName());
+ roomDto.setFloorId(queryStatisticsDto.getFloorId());
+ roomDto.setLink(queryStatisticsDto.getLink());
+ roomDto.setStartDate(queryStatisticsDto.getStartDate());
+ roomDto.setEndDate(queryStatisticsDto.getEndDate());
+ addRoomNumCondition(queryStatisticsDto, roomDto);
+ return baseDataStatisticsInnerServiceSMOImpl.getReceivedRoomCount(roomDto);
+ }
+
+ @Override
+ public List<RoomDto> getReceivedRoomInfo(QueryStatisticsDto queryStatisticsDto) {
+ RoomDto roomDto = new RoomDto();
+ roomDto.setCommunityId(queryStatisticsDto.getCommunityId());
+ roomDto.setFloorId(queryStatisticsDto.getFloorId());
+ roomDto.setPage(queryStatisticsDto.getPage());
+ roomDto.setRow(queryStatisticsDto.getRow());
+ roomDto.setOwnerName(queryStatisticsDto.getOwnerName());
+ roomDto.setFloorId(queryStatisticsDto.getFloorId());
+ roomDto.setLink(queryStatisticsDto.getLink());
+ roomDto.setStartDate(queryStatisticsDto.getStartDate());
+ roomDto.setEndDate(queryStatisticsDto.getEndDate());
+ addRoomNumCondition(queryStatisticsDto, roomDto);
+ return baseDataStatisticsInnerServiceSMOImpl.getReceivedRoomInfo(roomDto);
+ }
+
+ @Override
+ public long getOweRoomCount(QueryStatisticsDto queryStatisticsDto) {
+ RoomDto roomDto = new RoomDto();
+ roomDto.setFloorId(queryStatisticsDto.getFloorId());
+ roomDto.setCommunityId(queryStatisticsDto.getCommunityId());
+ roomDto.setOwnerName(queryStatisticsDto.getOwnerName());
+ roomDto.setFloorId(queryStatisticsDto.getFloorId());
+ roomDto.setLink(queryStatisticsDto.getLink());
+ roomDto.setStartDate(queryStatisticsDto.getStartDate());
+ roomDto.setEndDate(queryStatisticsDto.getEndDate());
+ addRoomNumCondition(queryStatisticsDto, roomDto);
+ return baseDataStatisticsInnerServiceSMOImpl.getOweRoomCount(roomDto);
+ }
+
+ @Override
+ public List<RoomDto> getOweRoomInfo(QueryStatisticsDto queryStatisticsDto) {
+ RoomDto roomDto = new RoomDto();
+ roomDto.setCommunityId(queryStatisticsDto.getCommunityId());
+ roomDto.setFloorId(queryStatisticsDto.getFloorId());
+ roomDto.setPage(queryStatisticsDto.getPage());
+ roomDto.setRow(queryStatisticsDto.getRow());
+ roomDto.setOwnerName(queryStatisticsDto.getOwnerName());
+ roomDto.setFloorId(queryStatisticsDto.getFloorId());
+ roomDto.setLink(queryStatisticsDto.getLink());
+ roomDto.setStartDate(queryStatisticsDto.getStartDate());
+ roomDto.setEndDate(queryStatisticsDto.getEndDate());
+ addRoomNumCondition(queryStatisticsDto, roomDto);
+ return baseDataStatisticsInnerServiceSMOImpl.getOweRoomInfo(roomDto);
}
@@ -164,6 +223,8 @@
}
+
+
/**
* roomNum 鎷嗗垎 鏌ヨ鎴垮眿淇℃伅
*
--
Gitblit v1.8.0