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

# Conflicts:
#	epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java

@@ -87,4 +87,6 @@ public interface IcNeighborHoodDao extends BaseDao<IcNeighborHoodEntity> {
      * @date 2022/4/28 09:10
      */
     void delProperty(@Param("neighborHoodIds")List<String> neighborHoodIds);
+
+    void updateOneNeighborHood(ImportGeneralDTO info);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java

@@ -227,13 +227,14 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
             buildingInfos = null == buildingInfos ? getBuildingInfos(dto.getAgencyId()) : buildingInfos;
             Object cacheBuilding = icHouseRedis.getTemporaryCacheBuilding(formDTO.getCustomerId(), formDTO.getUserId(), dto.getNeighborHoodId() + "_" + dto.getBuildingName());
             dto.setBuildingId(null == cacheBuilding ? "" : cacheBuilding.toString());
-            if (StringUtils.isNotBlank(dto.getBuildingId())){
+            /*if (StringUtils.isNotBlank(dto.getBuildingId())){
                 // 说明数据库已存在此楼栋，不需添加
                 nums.add(num);
                 disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
             }else {
                 needDisposeList.add(dto);
-            }
+            }*/
+            needDisposeList.add(dto);
         }else {
             needDisposeList.add(dto);
         }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java

@@ -88,12 +88,6 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
         info = data;
         num = num + NumConstant.ONE;
         info.setNum(num);
-        if (StringUtils.isBlank(data.getNeighborHoodName()) ||
-                StringUtils.isBlank(data.getGridName()) || StringUtils.isBlank(data.getAgencyName()) || StringUtils.isBlank(data.getAddress())){
-            nums.add(num);
-            disposeErrorMsg(info,NEIGHBORHOOD_TYPE_ERROR);
-            return;
-        }
         if(StringUtils.isBlank(data.getAgencyName())){
             nums.add(num);
             disposeErrorMsg(info, "所属组织的值未填写");
@@ -109,7 +103,7 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
             disposeErrorMsg(info,"小区名称的值未填写");
             return;
         }
-        if(StringUtils.isBlank(data.getNeighborHoodName())){
+        if(StringUtils.isBlank(data.getAddress())){
             nums.add(num);
             disposeErrorMsg(info,"详细地址的值未填写");
             return;

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

@@ -567,6 +567,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
         IcNeighborHoodEntity entity = baseDao.selectOne(wrapper);
         if (null != entity) {
             info.setNeighborHoodExistStatus(true);
+            baseDao.updateOneNeighborHood(info);
             return entity.getId();
         }
         entity = new IcNeighborHoodEntity();

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

@@ -51,6 +51,7 @@
             BUILDING_LEADER_NAME = #{buildingLeaderName},
             BUILDING_LEADER_MOBILE = #{buildingLeaderMobile},
             SORT = #{sort},
+            TYPE = #{type},
             UPDATED_TIME = NOW()
         WHERE ID = #{buildingId}
     </update>
@@ -91,7 +92,7 @@
         c.ORGANIZATION_NAME as agencyName,
         d.ID as  gridId,
         d.GRID_NAME as gridName,
-        a.SORT as sort,
+        IFNULL(a.SORT,0) as sort,
         a.LONGITUDE as longitude,
         a.LATITUDE as latitude,
         a.TYPE as buildingTypeKey,

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

@@ -112,7 +112,7 @@
         ag.ORGANIZATION_NAME agencyName,
         c.GRID_ID as gridId,
         gr.GRID_NAME,
-        a.sort
+        IFNULL(a.sort,0) as sort
         from ic_house a
         LEFT JOIN ic_building b on a.BUILDING_ID = b.ID and b.DEL_FLAG = '0'
         LEFT JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID and c.DEL_FLAG = '0'

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

@@ -67,6 +67,13 @@
         </foreach>
         )
     </update>
+    <update id="updateOneNeighborHood">
+        update ic_neighbor_hood
+        set ADDRESS = #{address},
+            REMARK = #{remark},
+            UPDATED_TIME = NOW()
+        where id = #{neighborHoodId}
+    </update>
 
     <!-- 删除物业关系 -->
     <delete id="delProperty">

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

@@ -597,6 +597,19 @@ public class IcResiUserController implements ResultDataResolver {
         return new Result();
     }
 
+    /**
+     * @param formDTO
+     * @Description 查询个人数据
+     * @author zxc
+     * @date 2021/11/3 9:21 上午
+     */
+    @PostMapping("persondata")
+    public Result<PersonDataResultDTO> personData(@LoginUser TokenDto tokenDto, @RequestBody PersonDataFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        ValidatorUtils.validateEntity(formDTO, PersonDataFormDTO.PersonDataForm.class);
+        return new Result<PersonDataResultDTO>().ok(icResiUserService.personData(formDTO));
+    }
+
     /**
      * @param formDTO
      * @param tokenDto