进入网格接口添加真实人名返参

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

@@ -51,7 +51,11 @@ public class UserInfoOnEnterGridResultDTO implements Serializable{
     private List<String> userRoleList;
 
     /**
-     *
+     * XX街道-Y先生/女士   如果是未认证居民，这一列为空
      */
     private String userStreetName;
+    /**
+     * XX街道-YYY  如果是未认证居民，这一列为空
+     */
+    private String userStreetTrueName;
 }

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

@@ -273,6 +273,7 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
         visitedFormDTO.setUserId(enterGridFormDTO.getUserId());
         visitedFormDTO.setIsReg(NumConstant.ZERO_STR);
         resultObj.setUserStreetName(StrConstant.EPMETY_STR);
+        resultObj.setUserStreetTrueName(StrConstant.EPMETY_STR);
         if (strangerInfo != null){
             if (StringUtils.isNotBlank(strangerInfo.getStreet()) && StringUtils.isNotBlank(strangerInfo.getSurname())){
                 String gender = null;
@@ -284,7 +285,9 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
                     gender = UserConstant.MAN_WOMAN;
                 }
                 String leaderName = strangerInfo.getStreet().concat(StrConstant.HYPHEN).concat(strangerInfo.getSurname()).concat(gender);
+                String userStreetTrueName = strangerInfo.getStreet().concat(StrConstant.HYPHEN).concat(strangerInfo.getSurname()).concat(strangerInfo.getName());
                 resultObj.setUserStreetName(leaderName);
+                resultObj.setUserStreetTrueName(userStreetTrueName);
                 visitedFormDTO.setIsReg(NumConstant.ONE_STR);
             }
         }