diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/ResiGroupMemberDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/ResiGroupMemberDTO.java index 9244410c3b..bc092e7205 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/ResiGroupMemberDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/ResiGroupMemberDTO.java @@ -43,6 +43,8 @@ public class ResiGroupMemberDTO implements Serializable { * 用户id,来源于customer_user.id */ private String customerUserId; + private String customerUserName; + private String customerUserMobile; /** * 小组id: 来源于resi_group表id diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java index 6b12507ce9..4675312559 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java @@ -346,4 +346,6 @@ public interface ResiGroupDao extends BaseDao { * @date 2021.09.08 14:00:52 */ List listGroupsByMember(@Param("memberUserId") String memberUserId, @Param("gridId") String gridId); + + List getMembersByGroup(@Param("ids")List ids); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index b97db2ca00..95b136c9ac 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -44,6 +44,7 @@ import com.epmet.commons.tools.utils.ScanContentUtils; import com.epmet.constant.ReadFlagConstant; import com.epmet.constant.UserMessageTypeConstant; import com.epmet.dto.form.*; +import com.epmet.dto.result.UserBaseInfoResultDTO; import com.epmet.dto.result.UserInfoResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.dto.result.UserRoleResultDTO; @@ -1946,6 +1947,16 @@ public class ResiGroupServiceImpl extends BaseServiceImpl groupIds = entityList.stream().map(m -> m.getId()).collect(Collectors.toList()); + List membersByGroup = baseDao.getMembersByGroup(groupIds); + Result> listResult = epmetUserOpenFeignClient.queryUserBaseInfo(membersByGroup.stream().map(m -> m.getCustomerUserId()).collect(Collectors.toList())); + if (!listResult.success()){ + throw new EpmetException("查询居民信息失败..."); + } + membersByGroup.stream().forEach(m -> listResult.getData().stream().filter(u -> u.getUserId().equals(m.getCustomerUserId())).forEach(u -> { + m.setCustomerUserMobile(u.getMobile()); + m.setCustomerUserName(u.getRealName()); + })); List list = entityList.stream().filter(i -> StringUtils.isNotBlank(i.getPartyOrgId())).map(item -> { IcPartyOrgTreeDTO dto = new IcPartyOrgTreeDTO(); dto.setId(item.getId()); @@ -1955,6 +1966,10 @@ public class ResiGroupServiceImpl extends BaseServiceImpl membersByGroup.stream().filter(m -> m.getResiGroupId().equals(l.getId())).forEach(m -> { + l.setPrincipal(m.getCustomerUserName()); + l.setPrincipalMobile(m.getCustomerUserMobile()); + })); if (CollectionUtils.isEmpty(list)) { return Collections.emptyMap(); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml index b04c4aef48..957b687fa5 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml @@ -1072,4 +1072,15 @@ and resi_group.STATE = 'approved' order by resi_group.CREATED_TIME desc +