新字段

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

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<ResiGroupEntity> {
 	 * @date 2021.09.08 14:00:52
 	 */
 	List<GroupDetailResultDTO> listGroupsByMember(@Param("memberUserId") String memberUserId, @Param("gridId") String gridId);
+
+	List<ResiGroupMemberDTO> getMembersByGroup(@Param("ids")List<String> ids);
 }

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<ResiGroupDao, ResiGrou
 		if (CollectionUtils.isEmpty(entityList)) {
 			return Collections.emptyMap();
 		}
+		List<String> groupIds = entityList.stream().map(m -> m.getId()).collect(Collectors.toList());
+		List<ResiGroupMemberDTO> membersByGroup = baseDao.getMembersByGroup(groupIds);
+		Result<List<UserBaseInfoResultDTO>> 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<IcPartyOrgTreeDTO> 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<ResiGroupDao, ResiGrou
 			dto.setPartyOrgName(item.getGroupName());
 			return dto;
 		}).collect(Collectors.toList());
+		list.stream().forEach(l -> 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();
 		}

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
     </select>
+    <select id="getMembersByGroup" resultType="com.epmet.resi.group.dto.member.ResiGroupMemberDTO">
+        SELECT CUSTOMER_USER_ID,RESI_GROUP_ID FROM resi_group_member
+        WHERE DEL_FLAG = '0'
+          AND GROUP_LEADER_FLAG = 'leader'
+          AND `STATUS` = 'approved'
+          AND RESI_GROUP_ID IN (
+              <foreach collection="ids" item="id" separator=",">
+                  #{id}
+              </foreach>
+            )
+    </select>
 </mapper>