From e64197421cf28099935f71f193989a3394d47fe0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 17 二月 2020 18:12:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserService/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java | 42 +++++++++++++++++++++++++++++++-----------
1 files changed, 31 insertions(+), 11 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 568d790..8bfec57 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,7 +1,7 @@
package com.java110.user.smo.impl;
-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;
@@ -9,17 +9,15 @@
import com.java110.core.smo.owner.IOwnerInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.CommunityMemberDto;
-import com.java110.dto.OwnerDto;
+import com.java110.dto.owner.OwnerDto;
import com.java110.dto.PageDto;
-import com.java110.dto.UserDto;
+import com.java110.dto.user.UserDto;
import com.java110.user.dao.IOwnerServiceDao;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StringUtils;
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;
@@ -49,7 +47,7 @@
//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())) {
communityMemberDto.setMemberId(ownerDto.getOwnerId());
@@ -58,11 +56,19 @@
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 +153,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);
}
--
Gitblit v1.8.0