From ee9e18ace27138553d90c1f3e003cf721e48d9e9 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 22 十二月 2019 01:51:20 +0800
Subject: [PATCH] 加入根据员工所属部门对应的小区加载相应小区信息
---
UserService/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java | 61 ++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 12 deletions(-)
diff --git a/UserService/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java b/UserService/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java
index 250cc88..a6ea73c 100644
--- a/UserService/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java
+++ b/UserService/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java
@@ -1,9 +1,10 @@
package com.java110.user.smo.impl;
-import com.java110.common.constant.CommunityMemberTypeConstant;
-import com.java110.common.constant.StatusConstant;
-import com.java110.common.util.BeanConvertUtil;
+import com.java110.utils.constant.CommunityMemberTypeConstant;
+import com.java110.utils.constant.OwnerTypeConstant;
+import com.java110.utils.constant.StatusConstant;
+import com.java110.utils.util.BeanConvertUtil;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.core.smo.community.ICommunityInnerServiceSMO;
import com.java110.core.smo.owner.IOwnerInnerServiceSMO;
@@ -49,20 +50,28 @@
//communityInnerServiceSMOImpl.getCommunityMembers()
//璋冪敤 灏忓尯鏈嶅姟鏌ヨ 灏忓尯鎴愬憳涓氫富淇℃伅
- CommunityMemberDto communityMemberDto = BeanConvertUtil.covertBean(ownerDto, CommunityMemberDto.class);
+ /* CommunityMemberDto communityMemberDto = BeanConvertUtil.covertBean(ownerDto, CommunityMemberDto.class);
communityMemberDto.setMemberTypeCd(CommunityMemberTypeConstant.OWNER);
- if(StringUtils.isEmpty(communityMemberDto.getMemberId())&& !StringUtils.isEmpty(ownerDto.getOwnerId())){
+ if (StringUtils.isEmpty(communityMemberDto.getMemberId()) && !StringUtils.isEmpty(ownerDto.getOwnerId())) {
communityMemberDto.setMemberId(ownerDto.getOwnerId());
}
List<CommunityMemberDto> communityMemberDtos = communityInnerServiceSMOImpl.getCommunityMembers(communityMemberDto);
if (communityMemberDtos == null || communityMemberDtos.size() < 1) {
return null;
+ }*/
+
+ int page = ownerDto.getPage();
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ ownerDto.setPage((page - 1) * ownerDto.getRow());
}
- Map ownerInfo = new HashMap();
- ownerInfo.put("ownerIds", getOwnerIds(communityMemberDtos));
- ownerInfo.put("ownerTypeCd", ownerDto.getOwnerTypeCd());
+ Map ownerInfo = BeanConvertUtil.beanCovertMap(ownerDto);
+ ownerInfo.put("communityId",ownerDto.getCommunityId());
+ ownerInfo.put("ownerTypeCd", OwnerTypeConstant.OWNER);
+ // ownerInfo.put("ownerIds", getOwnerIds(communityMemberDtos));
+ //ownerInfo.put("ownerTypeCd", ownerDto.getOwnerTypeCd());
ownerInfo.put("statusCd", StatusConstant.STATUS_CD_VALID);
List<OwnerDto> owners = BeanConvertUtil.covertBeanList(ownerServiceDaoImpl.getOwnerInfo(ownerInfo), OwnerDto.class);
@@ -147,10 +156,24 @@
public int queryOwnersCount(@RequestBody OwnerDto ownerDto) {
//璋冪敤 灏忓尯鏈嶅姟鏌ヨ 灏忓尯鎴愬憳涓氫富淇℃伅
- CommunityMemberDto communityMemberDto = new CommunityMemberDto();
+ /*CommunityMemberDto communityMemberDto = new CommunityMemberDto();
communityMemberDto.setCommunityId(ownerDto.getCommunityId());
communityMemberDto.setMemberTypeCd(CommunityMemberTypeConstant.OWNER);
- return communityInnerServiceSMOImpl.getCommunityMemberCount(communityMemberDto);
+ return communityInnerServiceSMOImpl.getCommunityMemberCount(communityMemberDto);*/
+ int page = ownerDto.getPage();
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ ownerDto.setPage((page - 1) * ownerDto.getRow());
+ }
+
+ Map ownerInfo = BeanConvertUtil.beanCovertMap(ownerDto);
+ ownerInfo.put("communityId",ownerDto.getCommunityId());
+ ownerInfo.put("ownerTypeCd", OwnerTypeConstant.OWNER);
+ // ownerInfo.put("ownerIds", getOwnerIds(communityMemberDtos));
+ //ownerInfo.put("ownerTypeCd", ownerDto.getOwnerTypeCd());
+ ownerInfo.put("statusCd", StatusConstant.STATUS_CD_VALID);
+
+ return ownerServiceDaoImpl.getOwnerInfoCount(ownerInfo);
}
@@ -163,7 +186,6 @@
if (page != PageDto.DEFAULT_PAGE) {
ownerDto.setPage((page - 1) * ownerDto.getRow());
- ownerDto.setRow(page * ownerDto.getRow());
}
return ownerServiceDaoImpl.queryOwnersCount(BeanConvertUtil.beanCovertMap(ownerDto));
}
@@ -176,7 +198,6 @@
if (page != PageDto.DEFAULT_PAGE) {
ownerDto.setPage((page - 1) * ownerDto.getRow());
- ownerDto.setRow(page * ownerDto.getRow());
}
List<OwnerDto> owners = BeanConvertUtil.covertBeanList(
ownerServiceDaoImpl.getOwnerInfoByCondition(BeanConvertUtil.beanCovertMap(ownerDto)), OwnerDto.class);
@@ -194,6 +215,22 @@
return owners;
}
+
+ @Override
+ public int queryNoEnterRoomOwnerCount(@RequestBody OwnerDto ownerDto) {
+ return ownerServiceDaoImpl.queryNoEnterRoomOwnerCount(BeanConvertUtil.beanCovertMap(ownerDto));
+ }
+
+ @Override
+ public List<OwnerDto> queryOwnersByRoom(@RequestBody OwnerDto ownerDto) {
+ return BeanConvertUtil.covertBeanList(ownerServiceDaoImpl.queryOwnersByRoom(BeanConvertUtil.beanCovertMap(ownerDto)), OwnerDto.class);
+ }
+
+ @Override
+ public List<OwnerDto> queryOwnersByParkingSpace(@RequestBody OwnerDto ownerDto) {
+ return BeanConvertUtil.covertBeanList(ownerServiceDaoImpl.queryOwnersByParkingSpace(BeanConvertUtil.beanCovertMap(ownerDto)), OwnerDto.class);
+ }
+
public IUserInnerServiceSMO getUserInnerServiceSMOImpl() {
return userInnerServiceSMOImpl;
}
--
Gitblit v1.8.0