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 | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 103 insertions(+), 3 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 9768e97..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,14 @@
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;
import com.java110.report.statistics.IBaseDataStatistics;
import com.java110.utils.util.StringUtil;
@@ -34,6 +35,9 @@
@Autowired
private IContractInnerServiceSMO contractInnerServiceSMOImpl;
+ @Autowired
+ private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
+
/**
* 鏌ヨ鍏ㄩ儴鎴垮眿
*
@@ -44,8 +48,11 @@
public long getRoomCount(QueryStatisticsDto queryStatisticsDto) {
RoomDto roomDto = new RoomDto();
- roomDto.setCommunityId(queryStatisticsDto.getCommunityId());
roomDto.setFloorId(queryStatisticsDto.getFloorId());
+ roomDto.setCommunityId(queryStatisticsDto.getCommunityId());
+ roomDto.setOwnerName(queryStatisticsDto.getOwnerName());
+ roomDto.setFloorId(queryStatisticsDto.getFloorId());
+ roomDto.setLink(queryStatisticsDto.getLink());
addRoomNumCondition(queryStatisticsDto, roomDto);
return baseDataStatisticsInnerServiceSMOImpl.getRoomCount(roomDto);
}
@@ -63,8 +70,71 @@
roomDto.setFloorId(queryStatisticsDto.getFloorId());
roomDto.setPage(queryStatisticsDto.getPage());
roomDto.setRow(queryStatisticsDto.getRow());
+ roomDto.setOwnerName(queryStatisticsDto.getOwnerName());
+ roomDto.setFloorId(queryStatisticsDto.getFloorId());
+ 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);
}
@@ -90,6 +160,7 @@
ownerDto.setOwnerTypeCd(OwnerDto.OWNER_TYPE_CD_OWNER);
ownerDto.setNameLike(queryStatisticsDto.getOwnerName());
ownerDto.setLink(queryStatisticsDto.getLink());
+ ownerDto.setCommunityId(queryStatisticsDto.getCommunityId());
return ownerV1InnerServiceSMOImpl.queryOwnersCount(ownerDto);
}
@@ -98,6 +169,7 @@
OwnerDto ownerDto = new OwnerDto();
ownerDto.setOwnerTypeCd(OwnerDto.OWNER_TYPE_CD_OWNER);
ownerDto.setNameLike(queryStatisticsDto.getOwnerName());
+ ownerDto.setCommunityId(queryStatisticsDto.getCommunityId());
ownerDto.setLink(queryStatisticsDto.getLink());
ownerDto.setPage(queryStatisticsDto.getPage());
ownerDto.setRow(queryStatisticsDto.getRow());
@@ -107,6 +179,7 @@
@Override
public long getContractCount(QueryStatisticsDto queryStatisticsDto) {
ContractDto contractDto = new ContractDto();
+ contractDto.setContractNameLike(queryStatisticsDto.getObjName());
contractDto.setStoreId(queryStatisticsDto.getStoreId());
contractDto.setbLink(queryStatisticsDto.getLink());
contractDto.setPartyBLike(queryStatisticsDto.getOwnerName());
@@ -118,12 +191,39 @@
ContractDto contractDto = new ContractDto();
contractDto.setStoreId(queryStatisticsDto.getStoreId());
contractDto.setbLink(queryStatisticsDto.getLink());
+ contractDto.setContractNameLike(queryStatisticsDto.getObjName());
contractDto.setPartyBLike(queryStatisticsDto.getOwnerName());
contractDto.setPage(queryStatisticsDto.getPage());
contractDto.setRow(queryStatisticsDto.getRow());
return contractInnerServiceSMOImpl.queryContracts(contractDto);
}
+ @Override
+ public long getCarCount(QueryStatisticsDto queryStatisticsDto) {
+ OwnerCarDto ownerCarDto = new OwnerCarDto();
+ ownerCarDto.setCommunityId(queryStatisticsDto.getCommunityId());
+ ownerCarDto.setCarNumLike(queryStatisticsDto.getObjName());
+ ownerCarDto.setOwnerName(queryStatisticsDto.getOwnerName());
+ ownerCarDto.setLink(queryStatisticsDto.getLink());
+ ownerCarDto.setCarTypeCd(OwnerCarDto.CAR_TYPE_PRIMARY);
+ return ownerCarInnerServiceSMOImpl.queryOwnerCarsCount(ownerCarDto);
+ }
+
+ @Override
+ public List<OwnerCarDto> getCar(QueryStatisticsDto queryStatisticsDto) {
+ OwnerCarDto ownerCarDto = new OwnerCarDto();
+ ownerCarDto.setCommunityId(queryStatisticsDto.getCommunityId());
+ ownerCarDto.setCarNumLike(queryStatisticsDto.getObjName());
+ ownerCarDto.setOwnerName(queryStatisticsDto.getOwnerName());
+ ownerCarDto.setLink(queryStatisticsDto.getLink());
+ ownerCarDto.setPage(queryStatisticsDto.getPage());
+ ownerCarDto.setRow(queryStatisticsDto.getRow());
+ ownerCarDto.setCarTypeCd(OwnerCarDto.CAR_TYPE_PRIMARY);
+ return ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
+ }
+
+
+
/**
* roomNum 鎷嗗垎 鏌ヨ鎴垮眿淇℃伅
--
Gitblit v1.8.0