查看群成员列表添加头像、用户显示名称

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java

@@ -2,14 +2,16 @@ package com.epmet.modules.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
+import com.epmet.dto.form.UserResiInfoListFormDTO;
 import com.epmet.dto.form.UserRoleFormDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.modules.feign.fallback.EpmetUserFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -28,8 +30,8 @@ public interface EpmetUserFeignClient {
 	 * @Description 查询用户注册信息
 	 * @Date 2020/3/30 10:45
 	 **/
-	@PostMapping(value = "epmetuser/userresiinfo/getUserResiInfoDTO", consumes = MediaType.APPLICATION_JSON_VALUE)
+	@PostMapping(value = "epmetuser/userresiinfo/getuserresiinfo", consumes = MediaType.APPLICATION_JSON_VALUE)
-	Result<UserResiInfoDTO> getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO);
+	Result<UserResiInfoResultDTO> getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO);
 
 	/**
 	 * @param userRoleFormDTO
@@ -40,4 +42,14 @@ public interface EpmetUserFeignClient {
 	 **/
 	@PostMapping(value = "epmetuser/userrole/getuserroleinfo", consumes = MediaType.APPLICATION_JSON_VALUE)
 	Result<List<UserRoleResultDTO>> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO);
+
+	/**
+	 * @param userResiInfoListFormDTO
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.UserResiInfoResultDTO>>
+	 * @Author yinzuomei
+	 * @Description 根据userId集合，查询用户注册信息
+	 * @Date 2020/4/7 22:14
+	 **/
+	@PostMapping(value = "epmetuser/userresiinfo/getuserresiinfolist", consumes = MediaType.APPLICATION_JSON_VALUE)
+	Result<List<UserResiInfoResultDTO>> getUserResiInfoList(@RequestBody UserResiInfoListFormDTO userResiInfoListFormDTO);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallback.java

@@ -3,9 +3,10 @@ package com.epmet.modules.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
+import com.epmet.dto.form.UserResiInfoListFormDTO;
 import com.epmet.dto.form.UserRoleFormDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import org.springframework.stereotype.Component;
@@ -21,7 +22,7 @@ import java.util.List;
 public class EpmetUserFeignClientFallback implements EpmetUserFeignClient {
 
 	@Override
-	public Result<UserResiInfoDTO> getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO) {
+	public Result<UserResiInfoResultDTO> getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoDTO", userResiInfoFormDTO);
 	}
 
@@ -29,4 +30,9 @@ public class EpmetUserFeignClientFallback implements EpmetUserFeignClient {
 	public Result<List<UserRoleResultDTO>> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserRoleInfo", userRoleFormDTO);
 	}
+
+	@Override
+	public Result<List<UserResiInfoResultDTO>> getUserResiInfoList(UserResiInfoListFormDTO userResiInfoListFormDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoList", userResiInfoListFormDTO);
+	}
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -30,6 +30,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.form.UserRoleFormDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.group.dao.ResiGroupDao;
@@ -244,7 +245,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 			return new Result<GroupSummarizeResultDTO>().error(ModuleConstant.GETGROUPSUMMARIZE_FAILED);
 		}
 		//获取组长信息
-		Result<UserResiInfoDTO> groupLeaderUserInfo = this.getGroupLeaderUserInfo(groupSummarizeFormDTO.getGroupId());
+		Result<UserResiInfoResultDTO> groupLeaderUserInfo = this.getGroupLeaderUserInfo(groupSummarizeFormDTO.getGroupId());
 		if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) {
 			groupSummarizeResultDTO.setLeaderName(groupLeaderUserInfo.getData().getShowName());
 		} else {
@@ -260,7 +261,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	 * @Description 根据组id查询组长信息
 	 * @Date 2020/3/30 15:07
 	 **/
-	private Result<UserResiInfoDTO> getGroupLeaderUserInfo(String groupId) {
+	private Result<UserResiInfoResultDTO> getGroupLeaderUserInfo(String groupId) {
 		//群主名称需要调用feign查询
 		ResiGroupEntity resiGroupEntity = baseDao.selectById(groupId);
 		if (null == resiGroupEntity) {
@@ -370,7 +371,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		UserResiInfoFormDTO resiUserInfoFormDTO = new UserResiInfoFormDTO();
 		resiUserInfoFormDTO.setUserId(initApplyGroupFormDTO.getUserId());
 		resiUserInfoFormDTO.setCustomerId(initApplyGroupFormDTO.getCustomerId());
-		Result<UserResiInfoDTO> result = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO);
+		Result<UserResiInfoResultDTO> result = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO);
 		if (!result.success() || null == result.getData() || StringUtils.isBlank(result.getData().getRegMobile())) {
 			logger.info("居民注册信息查询失败");
 			return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getValue(),EpmetErrorCode.CANNOT_JOIN_GROUP.getName());

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java

@@ -31,6 +31,7 @@ import com.epmet.constant.ReadFlagConstant;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.feign.MessageFeignClient;
 import com.epmet.modules.constant.UserMessageConstant;
 import com.epmet.modules.feign.EpmetUserFeignClient;
@@ -203,7 +204,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		}
 		LinkGroupInfoResultDTO linkGroupInfoResultDTO = baseDao.selectLinkGroupInfo(validResult.getData().getResiGroupId());
 		//获取组长信息
-		Result<UserResiInfoDTO> groupLeaderUserInfo = this.getGroupLeaderUserInfo(linkGroupInfoResultDTO.getGroupId());
+		Result<UserResiInfoResultDTO> groupLeaderUserInfo = this.getGroupLeaderUserInfo(linkGroupInfoResultDTO.getGroupId());
 		if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) {
 			linkGroupInfoResultDTO.setLeaderName(groupLeaderUserInfo.getData().getShowName());
 		} else {
@@ -219,7 +220,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 	 * @Description 根据组id查询组长信息
 	 * @Date 2020/3/30 15:07
 	 **/
-	private Result<UserResiInfoDTO> getGroupLeaderUserInfo(String groupId) {
+	private Result<UserResiInfoResultDTO> getGroupLeaderUserInfo(String groupId) {
 		//群主名称需要调用feign查询
 		ResiGroupEntity resiGroupEntity = resiGroupDao.selectById(groupId);
 		if (null == resiGroupEntity) {
@@ -319,7 +320,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		UserResiInfoFormDTO userResiInfoFormDTO=new UserResiInfoFormDTO();
 		userResiInfoFormDTO.setUserId(formDTO.getUserId());
 		userResiInfoFormDTO.setCustomerId(resiGroupDTO.getCustomerId());
-		Result<UserResiInfoDTO> userResiInfoDTOResult=epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO);
+		Result<UserResiInfoResultDTO> userResiInfoDTOResult=epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO);
 		if(!userResiInfoDTOResult.success()||null==userResiInfoDTOResult.getData()){
 			return ;
 		}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java

@@ -29,6 +29,8 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.ReadFlagConstant;
 import com.epmet.dto.form.UserMessageFormDTO;
+import com.epmet.dto.form.UserResiInfoListFormDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.feign.MessageFeignClient;
 import com.epmet.modules.constant.UserMessageConstant;
 import com.epmet.modules.feign.EpmetUserFeignClient;
@@ -55,6 +57,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -210,10 +213,25 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		groupMemberListFormDTO.setPageNo(pageIndex);
 		List<GroupMemberListResultDTO> list = baseDao.selectListGroupMember(groupMemberListFormDTO);
 		if (null != list && list.size() > 0) {
+			List<String> userIdList=new ArrayList<>();
 			for (GroupMemberListResultDTO groupMemberListResultDTO : list) {
-				groupMemberListResultDTO.setUserShowName("测试昵称");
+//				groupMemberListResultDTO.setUserShowName("测试昵称");
-				groupMemberListResultDTO.setHeadPhoto("https://wx.qlogo.cn/mmopen/vi_32/PiajxSqBRaEIXGqhj0JakGnhk0L4x31XuWyQM4OxnriaKD4GuAgr8GdLpwu8jphH0oQPbPy0pepWU5iciaIeQwUJPg/132");
+//				groupMemberListResultDTO.setHeadPhoto("https://wx.qlogo.cn/mmopen/vi_32/PiajxSqBRaEIXGqhj0JakGnhk0L4x31XuWyQM4OxnriaKD4GuAgr8GdLpwu8jphH0oQPbPy0pepWU5iciaIeQwUJPg/132");
-
+				userIdList.add(groupMemberListResultDTO.getUserId());
+			}
+			UserResiInfoListFormDTO formDTO=new UserResiInfoListFormDTO();
+			formDTO.setUserIdList(userIdList);
+			Result<List<UserResiInfoResultDTO>> userResiInfoDTOListResult=epmetUserFeignClient.getUserResiInfoList(formDTO);
+			if(userResiInfoDTOListResult.success()){
+				for(UserResiInfoResultDTO userResiInfo:userResiInfoDTOListResult.getData()){
+					for (GroupMemberListResultDTO groupMember : list) {
+						if(groupMember.getUserId().equals(userResiInfo.getUserId())){
+							groupMember.setUserShowName(userResiInfo.getShowName());
+							groupMember.setHeadPhoto(userResiInfo.getHeadPhoto());
+							break;
+						}
+					}
+				}
 			}
 		}
 		return new Result<List<GroupMemberListResultDTO>>().ok(list);
@@ -232,10 +250,27 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		applyingMemberFormDTO.setPageNo(pageIndex);
 		List<ApplyingMemberResultDTO> list = baseDao.selectListApplyingMember(applyingMemberFormDTO);
 		if (null != list && list.size() > 0) {
+			List<String> userIdList=new ArrayList<>();
 			for (ApplyingMemberResultDTO applyingMemberResultDTO : list) {
-				applyingMemberResultDTO.setApplyUserName("测试昵称");
+//				applyingMemberResultDTO.setApplyUserName("测试昵称");
-				applyingMemberResultDTO.setApplyUserHeadPhoto("https://wx.qlogo.cn/mmopen/vi_32/PiajxSqBRaEIXGqhj0JakGnhk0L4x31XuWyQM4OxnriaKD4GuAgr8GdLpwu8jphH0oQPbPy0pepWU5iciaIeQwUJPg/132");
+//				applyingMemberResultDTO.setApplyUserHeadPhoto("https://wx.qlogo.cn/mmopen/vi_32/PiajxSqBRaEIXGqhj0JakGnhk0L4x31XuWyQM4OxnriaKD4GuAgr8GdLpwu8jphH0oQPbPy0pepWU5iciaIeQwUJPg/132");
+				userIdList.add(applyingMemberResultDTO.getApplyUserId());
 			}
+			UserResiInfoListFormDTO formDTO=new UserResiInfoListFormDTO();
+			formDTO.setUserIdList(userIdList);
+			Result<List<UserResiInfoResultDTO>> userResiInfoDTOListResult=epmetUserFeignClient.getUserResiInfoList(formDTO);
+			if(userResiInfoDTOListResult.success()){
+				for(UserResiInfoResultDTO userResiInfo:userResiInfoDTOListResult.getData()){
+					for (ApplyingMemberResultDTO memberInfo : list) {
+						if(memberInfo.getApplyUserId().equals(userResiInfo.getUserId())){
+							memberInfo.setApplyUserName(userResiInfo.getShowName());
+							memberInfo.setApplyUserHeadPhoto(userResiInfo.getHeadPhoto());
+							break;
+						}
+					}
+				}
+			}
+
 		}
 		return new Result<List<ApplyingMemberResultDTO>>().ok(list);
 	}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -26,8 +26,8 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.group.dao.ResiGroupDao;
 import com.epmet.modules.group.entity.ResiGroupEntity;
@@ -424,8 +424,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         UserResiInfoFormDTO userParam = new UserResiInfoFormDTO();
         userParam.setUserId(tokenDto.getUserId());
         userParam.setCustomerId(group.getCustomerId());
-        Result<UserResiInfoDTO> userInfo =
+        Result<UserResiInfoResultDTO> userInfo =  epmetUserFeignClient.getUserResiInfoDTO(userParam);
-        epmetUserFeignClient.getUserResiInfoDTO(userParam);
         if(userInfo.success()){
             resultDTO.setReleaseUserName(userInfo.getData().getSurname() + userInfo.getData().getName());
 

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserResiInfoListFormDTO.java

@@ -0,0 +1,18 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author yinzuomei
+ * @Date 2020/4/7 18:20
+ */
+@Data
+public class UserResiInfoListFormDTO implements Serializable {
+	private static final long serialVersionUID = -4454561042197166135L;
+
+	private List<String> userIdList;
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java

@@ -0,0 +1,65 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author yinzuomei
+ * @Date 2020/4/7 18:45
+ */
+@Data
+public class UserResiInfoResultDTO implements Serializable {
+
+	/**
+	 * 唯一标识
+	 */
+	private String id;
+
+	/**
+	 * 用户Id(主键) user.id
+	 */
+	private String userId;
+
+	/**
+	 * 手机号(注册手机号)
+	 */
+	private String regMobile;
+
+	/**
+	 * 姓氏
+	 */
+	private String surname;
+
+	/**
+	 * 名称
+	 */
+	private String name;
+
+	/**
+	 * 街道
+	 */
+	private String street;
+
+	/**
+	 * 小区名称
+	 */
+	private String district;
+
+	/**
+	 * 楼栋单元
+	 */
+	private String buildingAddress;
+
+	/**
+	 * 用户显示名称
+	 */
+	private String showName;
+
+	/**
+	 * 用户头像
+	 */
+	private String headPhoto;
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java

@@ -27,7 +27,9 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
+import com.epmet.dto.form.UserResiInfoListFormDTO;
 import com.epmet.dto.form.VerificationCodeFormDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.excel.UserResiInfoExcel;
 import com.epmet.service.UserResiInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -100,12 +102,24 @@ public class UserResiInfoController {
      * @Description 查询用户注册信息
      * @Date 2020/3/30 10:49
      **/
-    @PostMapping("getUserResiInfoDTO")
+    @PostMapping("getuserresiinfo")
-    public Result<UserResiInfoDTO> getUserResiInfoDTO(@RequestBody UserResiInfoFormDTO userResiInfoFormDTO) {
+    public Result<UserResiInfoResultDTO> getUserResiInfoDTO(@RequestBody UserResiInfoFormDTO userResiInfoFormDTO) {
         ValidatorUtils.validateEntity(userResiInfoFormDTO);
         return userResiInfoService.getUserResiInfoDTO(userResiInfoFormDTO);
     }
 
+    /**
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.UserResiInfoDTO>>
+     * @param userResiInfoListFormDTO
+     * @Author yinzuomei
+     * @Description 根据userId集合查询用户注册信息
+     * @Date 2020/4/7 18:24
+     **/
+    @PostMapping("getuserresiinfolist")
+    public Result<List<UserResiInfoResultDTO>> getUserResiInfoList(@RequestBody UserResiInfoListFormDTO userResiInfoListFormDTO){
+        return userResiInfoService.getUserResiInfoList(userResiInfoListFormDTO);
+    }
+
     /**
      * @param userResiInfoDTO
      * @Author sun

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java

@@ -20,8 +20,10 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.entity.UserResiInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -41,7 +43,7 @@ public interface UserResiInfoDao extends BaseDao<UserResiInfoEntity> {
 	 * @Description 查询用户注册信息
 	 * @Date 2020/3/30 11:10
 	 **/
-	UserResiInfoDTO selectUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO);
+	UserResiInfoResultDTO selectUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO);
 
 	/**
 	 * @Author sun
@@ -49,4 +51,12 @@ public interface UserResiInfoDao extends BaseDao<UserResiInfoEntity> {
 	 **/
 	List<UserResiInfoDTO> selectResiInfoByMobile(String regMobile);
 
+	/**
+	 * @return java.util.List<com.epmet.dto.UserResiInfoDTO>
+	 * @param userIdList
+	 * @Author yinzuomei
+	 * @Description 根据userId集合查询用户注册信息
+	 * @Date 2020/4/7 18:26
+	 **/
+	List<UserResiInfoResultDTO> selectListUserResiInfoDTO(@Param("userIdList") List<String> userIdList);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java

@@ -22,7 +22,9 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
+import com.epmet.dto.form.UserResiInfoListFormDTO;
 import com.epmet.dto.form.VerificationCodeFormDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.entity.UserResiInfoEntity;
 
 import java.util.List;
@@ -103,7 +105,7 @@ public interface UserResiInfoService extends BaseService<UserResiInfoEntity> {
 	 * @Description 查询用户注册信息
 	 * @Date 2020/3/30 11:07
 	 **/
-	Result<UserResiInfoDTO> getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO);
+	Result<UserResiInfoResultDTO> getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO);
 
 	/**
 	 * 居民端-居民注册信息提交
@@ -130,4 +132,13 @@ public interface UserResiInfoService extends BaseService<UserResiInfoEntity> {
 	 * @author zhaoqifeng
 	 */
 	Result saveResiInfo(UserResiInfoDTO userResiInfoDTO);
+
+	/**
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.UserResiInfoDTO>>
+	 * @param userResiInfoListFormDTO
+	 * @Author yinzuomei
+	 * @Description 根据userId集合查询用户注册信息
+	 * @Date 2020/4/7 18:21
+	 **/
+	Result<List<UserResiInfoResultDTO>> getUserResiInfoList(UserResiInfoListFormDTO userResiInfoListFormDTO);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java

@@ -37,6 +37,7 @@ import com.epmet.dto.form.EnterGridFormDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.form.UserRoleFormDTO;
 import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.entity.RegisterRelationEntity;
 import com.epmet.entity.UserCustomerEntity;
@@ -232,7 +233,7 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
             UserResiInfoFormDTO userResiInfoFormDTO = new UserResiInfoFormDTO();
             userResiInfoFormDTO.setUserId(enterGridFormDTO.getUserId());
             userResiInfoFormDTO.setCustomerId(enterGridFormDTO.getCustomerId());
-            UserResiInfoDTO userResiInfo =  userResiInfoDao.selectUserResiInfoDTO(userResiInfoFormDTO);
+            UserResiInfoResultDTO userResiInfo =  userResiInfoDao.selectUserResiInfoDTO(userResiInfoFormDTO);
             resultObj.setNickname(userResiInfo.getSurname() + userResiInfo.getName());
 
         }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java

@@ -34,7 +34,9 @@ import com.epmet.dao.UserResiInfoDao;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.UserRoleDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
+import com.epmet.dto.form.UserResiInfoListFormDTO;
 import com.epmet.dto.form.VerificationCodeFormDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.entity.UserResiInfoEntity;
 import com.epmet.entity.UserRoleEntity;
 import com.epmet.feign.MessageFeignClient;
@@ -50,10 +52,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
+import java.util.*;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 用户居民端注册信息表  用户在居民端完善的个人信息
@@ -138,13 +137,9 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 	 * @Date 2020/3/30 11:07
 	 **/
 	@Override
-	public Result<UserResiInfoDTO> getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO) {
+	public Result<UserResiInfoResultDTO> getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO) {
-		UserResiInfoDTO userResiInfoDTO = baseDao.selectUserResiInfoDTO(userResiInfoFormDTO);
+		UserResiInfoResultDTO userResiInfoDTO = baseDao.selectUserResiInfoDTO(userResiInfoFormDTO);
-		if (null != userResiInfoDTO) {
+		return new Result<UserResiInfoResultDTO>().ok(userResiInfoDTO);
-			String showName = userResiInfoDTO.getStreet() + "-" + userResiInfoDTO.getSurname() + userResiInfoDTO.getName();
-			userResiInfoDTO.setShowName(showName);
-		}
-		return new Result<UserResiInfoDTO>().ok(userResiInfoDTO);
 	}
 
 	/**
@@ -244,6 +239,23 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 		return result;
 	}
 
+	/**
+	 * @param userResiInfoListFormDTO
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.UserResiInfoDTO>>
+	 * @Author yinzuomei
+	 * @Description 根据userId集合查询用户注册信息
+	 * @Date 2020/4/7 18:21
+	 **/
+	@Override
+	public Result<List<UserResiInfoResultDTO>> getUserResiInfoList(UserResiInfoListFormDTO userResiInfoListFormDTO) {
+		List<UserResiInfoResultDTO> list=new ArrayList<>();
+		if(null==userResiInfoListFormDTO.getUserIdList()){
+			return new Result<List<UserResiInfoResultDTO>>().ok(list);
+		}
+		list= baseDao.selectListUserResiInfoDTO(userResiInfoListFormDTO.getUserIdList());
+		return new Result<List<UserResiInfoResultDTO>>().ok(list);
+	}
+
 	/**
 	 * 判断手机号是否可用-根据手机号查询居民注册信息(user_resi_info)表数据
 	 *

epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml

@@ -40,7 +40,7 @@
 
     <!-- 查询用户注册信息   -->
     <select id="selectUserResiInfoDTO" parameterType="com.epmet.dto.form.UserResiInfoFormDTO"
-            resultType="com.epmet.dto.UserResiInfoDTO">
+            resultType="com.epmet.dto.result.UserResiInfoResultDTO">
         SELECT
             uri.id,
             uc.USER_ID,
@@ -49,8 +49,15 @@
             uri.`NAME`,
             uri.STREET,
             uri.DISTRICT,
-            uri.BUILDING_ADDRESS,
+            uri.RESI_VISIT_ID,
-            uri.RESI_VISIT_ID
+            CONCAT_WS('-',uri.STREET,uri.SURNAME,uri.`NAME`) as show_name,
+            (
+            select uw.HEAD_IMG_URL from user_wechat uw
+            where uw.DEL_FLAG='0'
+            and uw.USER_ID=#{userId}
+            order by uw.CREATED_TIME
+            limit 1
+            )as head_photo
         FROM
             user_customer uc
             LEFT JOIN user_resi_info uri ON ( uc.USER_ID = uri.USER_ID )
@@ -70,4 +77,26 @@
         AND uri.reg_mobile = #{regMobile}
     </select>
 
+    <!-- 根据userId集合查询用户注册信息   -->
+    <select id="selectListUserResiInfoDTO" resultType="com.epmet.dto.result.UserResiInfoResultDTO">
+         SELECT
+            uri.id,
+            uri.USER_ID,
+            uri.REG_MOBILE,
+            uri.SURNAME,
+            uri.`NAME`,
+            uri.STREET,
+            uri.DISTRICT,
+            uri.BUILDING_ADDRESS,
+            CONCAT_WS('-',uri.STREET,uri.SURNAME,uri.`NAME`) as show_name,
+            uw.HEAD_IMG_URL as head_photo
+        FROM user_resi_info uri
+        left join  user_wechat uw on(uri.user_id=uw.USER_ID)
+        WHERE uri.DEL_FLAG = '0'
+        and uw.DEL_FLAG='0'
+        AND uri.USER_ID in
+        <foreach item="userId" collection="userIdList" separator="," open="(" close=")" index="">
+            #{userId}
+        </foreach>
+    </select>
 </mapper>