Merge remote-tracking branch 'remotes/origin/bugfix/teamB_shuangshi'

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/HouseInfoCache.java

@@ -102,6 +102,7 @@ public class HouseInfoCache implements Serializable {
      * 房屋编码
      */
     private String houseCode;
+    private String coding;
     /**
      * 二维码地址
      */

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseInfoDTO.java

@@ -103,6 +103,7 @@ public class HouseInfoDTO implements Serializable {
      * 房屋编码
      */
     private String houseCode;
+    private String coding;
     /**
      * 二维码地址
      */

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@@ -574,7 +574,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         if (null == houseInfo) {
             return houseInfo;
         }
-        if (null != houseInfo && StringUtils.isNotBlank(houseInfo.getAgencyId())) {
+        if (StringUtils.isNotBlank(houseInfo.getAgencyId())) {
             AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(houseInfo.getAgencyId());
             houseInfo.setAgencyPathName(StringUtils.isNotBlank(agencyInfoCache.getAllParentName()) ? agencyInfoCache.getAllParentName().concat(StrConstant.HYPHEN).concat(agencyInfoCache.getOrganizationName()) : agencyInfoCache.getOrganizationName());
             houseInfo.setAreaCode(StringUtils.isNotBlank(agencyInfoCache.getAreaCode()) ? agencyInfoCache.getAreaCode() : StrConstant.EPMETY_STR);

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@@ -274,6 +274,7 @@
         n.GRID_ID,
         gr.GRID_NAME,
         ih.HOUSE_CODE,
+        ih.CODING,
         ih.HOUSE_QRCODE_URL
         FROM ic_house ih
         left JOIN ic_neighbor_hood n ON ( ih.NEIGHBOR_HOOD_ID = n.id AND n.DEL_FLAG = '0')

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

@@ -19,5 +19,6 @@ public class HomeInfoResultDTO implements Serializable {
     private String houseId;
     private String houseName;
     private String houseCode;
+    private String coding;
     private String qrCodeUrl;
 }

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

@@ -2525,10 +2525,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 throw new EpmetException(EpmetErrorCode.ORG_ADD_FAILED.getCode(), errorMsg, errorMsg);
             }
         }
-
+        GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(houseInfo.getGridId());
+        if (null == gridInfo) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询网格信息失败", "查询网格信息失败");
+        }
         dto.setCustomerId(houseInfo.getCustomerId());
         dto.setAgencyId(houseInfo.getAgencyId());
-        dto.setPids(houseInfo.getAgencyPids());
+        dto.setPids(gridInfo.getPids());
         dto.setGridId(houseInfo.getGridId());
         dto.setVillageId(houseInfo.getNeighborHoodId());
         dto.setBuildId(houseInfo.getBuildingId());

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

@@ -187,6 +187,7 @@ public class MyHomeServiceImpl implements MyHomeService {
         resultDto.setHouseName(houseInfo.getAllName());
         resultDto.setHouseCode(houseInfo.getHouseCode());
         resultDto.setQrCodeUrl(houseInfo.getHouseQrcodeUrl());
+        resultDto.setCoding(houseInfo.getCoding());
         return resultDto;
     }
 }