Merge remote-tracking branch 'remotes/origin/dev_resi_export' into develop

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/IcExportItemListFormDTO.java

@@ -61,9 +61,13 @@ public class IcExportItemListFormDTO implements Serializable {
     private String columnName;
 
     /**
-     * 只有远程获取的才有值
+     * item选项 值
      */
     private String optionSourceValue;
+    /**
+     * item选项 值获取方式
+     */
+    private String optionSourceType;
 
 
 }

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

@@ -48,6 +48,7 @@ public class IcHouseDTO implements Serializable {
      * 小区id
      */
 	private String neighborHoodId;
+    private String neighborHoodName;
 
     /**
      * 片区id，neighbor_hood_part.id,可为空。

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

@@ -95,9 +95,11 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
 
         HouseInfoDTO houseInfo = icHouseRedis.getHouseInfo(id, dto.getCustomerId());
         if (null != houseInfo) {
-            dto.setBuildingName(houseInfo.getNeighborHoodName().concat(houseInfo.getBuildingName()));
+            dto.setNeighborHoodName(houseInfo.getNeighborHoodName());
+            dto.setBuildingName(houseInfo.getBuildingName());
             dto.setUnitName(houseInfo.getUnitName());
         } else {
+            dto.setNeighborHoodName(StrConstant.EPMETY_STR);
             dto.setBuildingName(StrConstant.EPMETY_STR);
             dto.setUnitName(StrConstant.EPMETY_STR);
         }

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

@@ -169,8 +169,6 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService {
 
                         IcCustomExportResultDTO.SqlColumn columnDTO = itemMap.get(key);
                         if (singleResult.size() < showSqlColumns.size()) {
-
-
                             IcCustomExportResultDTO.SqlColumn sqlColumn = itemMap.get(key);
                             String tableName = sqlColumn.getTableName();
                             String itemId = sqlColumn.getItemId();