From 47f882588d1d18df404478bc79cc53cb608549a2 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期五, 20 八月 2021 22:20:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xinghong-dev
---
service-user/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java b/service-user/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java
old mode 100644
new mode 100755
index ee6b27c..34bbad5
--- a/service-user/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java
+++ b/service-user/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java
@@ -1,6 +1,5 @@
package com.java110.user.smo.impl;
-
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.CommunityMemberDto;
import com.java110.dto.PageDto;
@@ -11,6 +10,7 @@
import com.java110.intf.user.IOwnerAttrInnerServiceSMO;
import com.java110.intf.user.IOwnerInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
+import com.java110.po.owner.OwnerPo;
import com.java110.user.dao.IOwnerServiceDao;
import com.java110.utils.constant.OwnerTypeConstant;
import com.java110.utils.constant.StatusConstant;
@@ -101,7 +101,7 @@
List<OwnerAttrDto> ownerAttrDtos = ownerAttrInnerServiceSMOImpl.queryOwnerAttrs(ownerAttrDto);
for (OwnerDto owner : owners) {
- refreshOwner(owner, users,ownerAttrDtos);
+ refreshOwner(owner, users, ownerAttrDtos);
}
return owners;
}
@@ -243,7 +243,7 @@
List<OwnerAttrDto> ownerAttrDtos = ownerAttrInnerServiceSMOImpl.queryOwnerAttrs(ownerAttrDto);
for (OwnerDto owner : owners) {
- refreshOwner(owner, users,ownerAttrDtos);
+ refreshOwner(owner, users, ownerAttrDtos);
}
return owners;
}
@@ -264,6 +264,35 @@
return BeanConvertUtil.covertBeanList(ownerServiceDaoImpl.queryOwnersByParkingSpace(BeanConvertUtil.beanCovertMap(ownerDto)), OwnerDto.class);
}
+ @Override
+ public int updateOwnerMember(OwnerPo ownerPo) {
+ Map info = BeanConvertUtil.beanCovertMap(ownerPo);
+ info.put("statusCd", "0");
+ ownerServiceDaoImpl.updateOwnerInfoInstance(info);
+ return 1;
+ }
+
+ @Override
+ public int queryOwnerLogsCountByRoom(@RequestBody OwnerDto ownerDto) {
+ return ownerServiceDaoImpl.queryOwnerLogsCountByRoom(BeanConvertUtil.beanCovertMap(ownerDto));
+ }
+
+ @Override
+ public List<OwnerDto> queryOwnerLogsByRoom(@RequestBody OwnerDto ownerDto) {
+ int page = ownerDto.getPage();
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ ownerDto.setPage((page - 1) * ownerDto.getRow());
+ }
+ return BeanConvertUtil.covertBeanList(ownerServiceDaoImpl.queryOwnerLogsByRoom(BeanConvertUtil.beanCovertMap(ownerDto)), OwnerDto.class);
+ }
+
+ @Override
+ public List<OwnerDto> queryAllOwners(@RequestBody OwnerDto ownerDto) {
+ List<OwnerDto> allOwners = BeanConvertUtil.covertBeanList(ownerServiceDaoImpl.getOwnerInfo(BeanConvertUtil.beanCovertMap(ownerDto)), OwnerDto.class);
+ return allOwners;
+ }
+
public IUserInnerServiceSMO getUserInnerServiceSMOImpl() {
return userInnerServiceSMOImpl;
}
--
Gitblit v1.8.0