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

4 years ago · 0a7ac4e753
71 changed files with 526 additions and 93 deletions
--- a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.12__up_sys_dict_data.sql
+++ b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.12__up_sys_dict_data.sql
@ -0,0 +1,17 @@
+
+
+UPDATE `epmet_admin`.`sys_dict_data` SET `id` = '1000000000000000220', `dict_label` = '区域化党建单位--楼宇党建'
+WHERE (`id` = '1000000000000000200');
+UPDATE `epmet_admin`.`sys_dict_data` SET `id` = '1000000000000000221', `dict_label` = '区域化党建单位--两新组织'
+WHERE (`id` = '1000000000000000201');
+UPDATE `epmet_admin`.`sys_dict_data` SET `id` = '1000000000000000222', `dict_label` = '区域化党建单位--区域单位党建'
+WHERE (`id` = '1000000000000000202');
+UPDATE `epmet_admin`.`sys_dict_data` SET `id` = '1000000000000000223', `dict_label` = '区域化党建单位--机关直属部门'
+WHERE (`id` = '1000000000000000203');
+UPDATE `epmet_admin`.`sys_dict_data` SET `id` = '1000000000000000224', `dict_label` = '区域化党建单位--其他'
+WHERE (`id` = '1000000000000000204');
+
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000225', '1000000000000000007', '社会组织--社会团体', '5', '0', '', '5', '0', '0', '', '2022-04-12 14:39:18', '', '2022-04-12 14:39:18');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000226', '1000000000000000007', '社会组织--民办非企业单位', '6', '0', '', '6', '0', '0', '', '2022-04-12 14:39:18', '', '2022-04-12 14:39:18');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000227', '1000000000000000007', '社会组织--基金会', '7', '0', '', '7', '0', '0', '', '2022-04-12 14:39:18', '', '2022-04-12 14:39:18');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000228', '1000000000000000007', '社会组织--其他', '8', '0', '', '8', '0', '0', '', '2022-04-12 14:39:18', '', '2022-04-12 14:39:18');
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/PartyUnitTypeEnum.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/PartyUnitTypeEnum.java
@ -7,11 +7,16 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 */
 public enum PartyUnitTypeEnum {
    //房屋类型，1楼房，2平房，3别墅
-    LOUYU("0", "楼宇党建"),
-    ZUZHI("1", "两新组织"),
-    DANWEI("2", "区域单位党建"),
-    JIGUAN("3", "机关直属部门"),
-    QITA("4", "其他");
+    LOUYU("0", "区域化党建单位--楼宇党建"),
+    ZUZHI("1", "区域化党建单位--两新组织"),
+    DANWEI("2", "区域化党建单位--区域单位党建"),
+    JIGUAN("3", "区域化党建单位--机关直属部门"),
+    QITA("4", "区域化党建单位--其他"),
+    SHZZ_SHTT("5", "社会组织--社会团体"),
+    SHZZ_MBFQYDW("6", "社会组织--民办非企业单位"),
+    SHZZ_JJH("7", "社会组织--基金会"),
+    SHZZ_QT("8", "社会组织--其他");
+
    private String code;
    private String name;

--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/AgencyInfoCache.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/AgencyInfoCache.java
@ -4,6 +4,7 @@ import lombok.Data;

 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;

 /**
 * @Author zxc
@ -59,6 +60,11 @@ public class AgencyInfoCache implements Serializable {
     */
    private String areaCode;

+    /**
+     * 地区编码全路径：例如：37,3702,370203,370203005,370203005015
+     */
+    private List<String> areaCodePath;
+
    /**
     * 删除标识
     */
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerAgencyDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerAgencyDTO.java
@ -21,6 +21,7 @@ import lombok.Data;

 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;


 /**
@ -172,4 +173,9 @@ public class CustomerAgencyDTO implements Serializable {
     * 联系电话
     */
    private String mobile;
+
+    /**
+     * 地区编码全路径：例如：37,3702,370203,370203005,370203005015
+     */
+    private List<String> areaCodePath;
 }
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java
@ -21,10 +21,10 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.beans.GridMemberDataAnalysisExcelExportBean;
+import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO;
 import com.epmet.dataaggre.dto.govorg.CustomerGridDTO;
 import com.epmet.dataaggre.dto.govorg.form.*;
 import com.epmet.dataaggre.dto.govorg.result.*;
-import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity;
 import com.epmet.dataaggre.enums.GridMemberDataAnalysisEnums;
 import com.epmet.dataaggre.service.AggreGridService;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
@ -242,8 +242,8 @@ public class GovOrgController {
     * @date 2021/11/5 2:54 下午
     */
    @PostMapping("agency")
-    public Result<CustomerAgencyEntity> getAgencyInfo(@RequestParam("agencyId")String agencyId){
-        return new Result<CustomerAgencyEntity>().ok(govOrgService.getAgencyInfo(agencyId));
+    public Result<CustomerAgencyDTO> getAgencyInfo(@RequestParam("agencyId")String agencyId){
+        return new Result<CustomerAgencyDTO>().ok(govOrgService.getAgencyInfo(agencyId));
    }

    /**
@ -305,7 +305,7 @@ public class GovOrgController {
            CustomerGridDTO gridInfo = govOrgService.getGridInfo(orgId);
            Optional.ofNullable(gridInfo).ifPresent((g) -> orgName.set(g.getGridName()));
        } else if ("agency".equals(orgType)) {
-            CustomerAgencyEntity agencyInfo = govOrgService.getAgencyInfo(orgId);
+            CustomerAgencyDTO agencyInfo = govOrgService.getAgencyInfo(orgId);
            Optional.ofNullable(agencyInfo).ifPresent((a) -> orgName.set(a.getOrganizationName()));
        }

--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java
@ -105,4 +105,5 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
     * @author sun
     */
    LinkedList<GridLivelyResultDTO> subAgencyListAndGridSumNum(@Param("agencyId") String agencyId);
+
 }
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
@ -8,7 +8,6 @@ import com.epmet.dataaggre.dto.govorg.CustomerGridDTO;
 import com.epmet.dataaggre.dto.govorg.form.*;
 import com.epmet.dataaggre.dto.govorg.result.*;
 import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO;
-import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity;

 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@ -162,7 +161,7 @@ public interface GovOrgService {
     * @author zxc
     * @date 2021/11/5 2:54 下午
     */
-    CustomerAgencyEntity getAgencyInfo(String agencyId);
+    CustomerAgencyDTO getAgencyInfo(String agencyId);

    /**
     * @Description  查询网格信息
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
@ -6,6 +6,7 @@ import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import com.alibaba.fastjson.JSON;
 import com.dingtalk.api.request.OapiRobotSendRequest;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.constant.DingDingRobotConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
@ -23,6 +24,7 @@ import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dataaggre.constant.DataSourceConstant;
@ -250,41 +252,6 @@ public class GovOrgServiceImpl implements GovOrgService {
        return result;
    }

-    public static void main(String[] args) {
-        List<NextAreaCodeResultDTO> allList = new ArrayList<>();
-        NextAreaCodeResultDTO m1 = new NextAreaCodeResultDTO();
-        m1.setAreaCode("1");
-        m1.setAreaName("a");
-        allList.add(m1);
-
-        NextAreaCodeResultDTO m2 = new NextAreaCodeResultDTO();
-        m2.setAreaCode("2");
-        m2.setAreaName("b");
-        allList.add(m2);
-
-
-        NextAreaCodeResultDTO m3 = new NextAreaCodeResultDTO();
-        m3.setAreaCode("3");
-        m3.setAreaName("c");
-        allList.add(m3);
-
-        List<String> stringList = new ArrayList<>();
-        stringList.add("1");
-        stringList.add("2");
-
-        Iterator<NextAreaCodeResultDTO> iterator = allList.iterator();
-        while (iterator.hasNext()) {
-            NextAreaCodeResultDTO next = iterator.next();
-            for (String usedAreaCode : stringList) {
-                if (next.getAreaCode().equals(usedAreaCode)) {
-                    iterator.remove();
-                }
-            }
-
-        }
-        System.out.println(JSON.toJSONString(allList, true));
-    }
-
    /**
     * @param staffId
     * @Author sun
@ -642,8 +609,46 @@ public class GovOrgServiceImpl implements GovOrgService {
     * @date 2021/11/5 2:54 下午
     */
    @Override
-    public CustomerAgencyEntity getAgencyInfo(String agencyId) {
-        return customerAgencyDao.selectById(agencyId);
+    public CustomerAgencyDTO getAgencyInfo(String agencyId) {
+        CustomerAgencyEntity customerAgencyEntity=customerAgencyDao.selectById(agencyId);
+        CustomerAgencyDTO res= ConvertUtils.sourceToTarget(customerAgencyEntity,CustomerAgencyDTO.class);
+        //设置行政地区编码全路径
+        if (StringUtils.isNotBlank(res.getAreaCode()) && StringUtils.isNotBlank(res.getParentAreaCode())) {
+            res.setAreaCodePath(queryAreaCodePath(res));
+        }
+        return res;
+    }
+
+    private List<String> queryAreaCodePath(CustomerAgencyDTO customerAgencyEntity) {
+        List<String> areaCodePath = new ArrayList<>();
+        switch (customerAgencyEntity.getLevel()) {
+            case Constant.COMMUNITY:
+                areaCodePath.add(customerAgencyEntity.getAreaCode().substring(NumConstant.ZERO, NumConstant.TWO));
+                areaCodePath.add(customerAgencyEntity.getAreaCode().substring(NumConstant.ZERO, NumConstant.FOUR));
+                areaCodePath.add(customerAgencyEntity.getAreaCode().substring(NumConstant.ZERO, NumConstant.SIX));
+                areaCodePath.add(customerAgencyEntity.getParentAreaCode());
+                areaCodePath.add(customerAgencyEntity.getAreaCode());
+                break;
+            case Constant.STREET:
+                areaCodePath.add(customerAgencyEntity.getAreaCode().substring(NumConstant.ZERO, NumConstant.TWO));
+                areaCodePath.add(customerAgencyEntity.getAreaCode().substring(NumConstant.ZERO, NumConstant.FOUR));
+                areaCodePath.add(customerAgencyEntity.getParentAreaCode());
+                areaCodePath.add(customerAgencyEntity.getAreaCode());
+                break;
+            case Constant.DISTRICT:
+                areaCodePath.add(customerAgencyEntity.getAreaCode().substring(NumConstant.ZERO, NumConstant.TWO));
+                areaCodePath.add(customerAgencyEntity.getParentAreaCode());
+                areaCodePath.add(customerAgencyEntity.getAreaCode());
+                break;
+            case Constant.CITY:
+                areaCodePath.add(customerAgencyEntity.getParentAreaCode());
+                areaCodePath.add(customerAgencyEntity.getAreaCode());
+                break;
+            case Constant.PROVINCE:
+                areaCodePath.add(customerAgencyEntity.getAreaCode());
+                break;
+        }
+        return areaCodePath;
    }

    /**
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java
@ -8,10 +8,10 @@ import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dataaggre.dto.epmetuser.result.StaffPatrolRecordDailyResultDTO;
+import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO;
 import com.epmet.dataaggre.dto.govorg.CustomerGridDTO;
 import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO;
 import com.epmet.dataaggre.entity.epmetuser.CustomerStaffEntity;
-import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity;
 import com.epmet.dataaggre.service.AggreGridService;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
@ -22,7 +22,6 @@ import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import sun.rmi.runtime.Log;

 import java.util.*;

@ -173,7 +172,7 @@ public class AggreGridServiceImpl implements AggreGridService {
     * @return
     */
    private String getPidsByAgencyId(String agencyId) {
-        CustomerAgencyEntity agencyInfo = govOrgService.getAgencyInfo(agencyId);
+        CustomerAgencyDTO agencyInfo = govOrgService.getAgencyInfo(agencyId);

        if (agencyInfo == null) {
            String errorMsg = "【网格员数据统计查询pcwork】查询组织信息返回为null";
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
@ -163,6 +163,7 @@
        WHERE
        u.del_flag = '0'
        AND PARTY_FLAG = 0
+        AND u.point_total > 0 <!-- 初心互助中公益达人，0分人员不显示在榜单上 -->
        <if test="orgType != null and orgType !=''">
            <if test="orgType == 'agency'">
                AND u.all_parent_ids LIKE CONCAT('%',#{orgId},'%')
@ -207,6 +208,7 @@
            WHERE
            u.del_flag = '0'
            AND party_flag = '1'<!-- 是否是党员标志：1是。0不是党员 -->
+            and u.point_total > 0 <!-- 初心互助中党员先锋排行，0分人员不显示在榜单上 -->
            <if test="orgType != null and orgType !=''">
                <if test="orgType == 'agency'">
                    AND u.all_parent_ids LIKE CONCAT('%',#{orgId},'%')
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationDTO.java
@ -133,4 +133,9 @@ public class IcCommunitySelfOrganizationDTO implements Serializable {
     */
 	private Date updatedTime;

+    /**
+     * 备注
+     */
+	private String remark;
+
 }
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java
@ -57,7 +57,8 @@ public class IcPartyActivityDTO implements Serializable {
     */
    @JsonIgnore
 	private String agencyId;
-
+    private String gridId;
+    private String gridName;
    /**
     * 组织的所有上级
     */
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActInfoDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActInfoDTO.java
@ -43,7 +43,7 @@ public class LatestActInfoDTO implements Serializable {
     * 客户id
     */
 	private String customerId;
-
+    private String gridId;
    /**
     * 活动标题
     */
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddCommunitySelfOrganizationFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddCommunitySelfOrganizationFormDTO.java
@ -56,6 +56,11 @@ public class AddCommunitySelfOrganizationFormDTO implements Serializable {
     */
    private String organizationCreatedTime;

+    /**
+     * 备注
+     */
+    private String remark;
+
    /**
     * 经度
     */
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/CommunitySelfOrganizationListFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/CommunitySelfOrganizationListFormDTO.java
@ -46,4 +46,6 @@ public class CommunitySelfOrganizationListFormDTO implements Serializable {
    private String customerId;
    private String agencyId;
    private Integer ranking;
+
+    private String remark;
 }
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditCommunitySelfOrganizationFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditCommunitySelfOrganizationFormDTO.java
@ -68,6 +68,11 @@ public class EditCommunitySelfOrganizationFormDTO implements Serializable {
     */
    private String latitude;

+    /**
+     * 备注
+     */
+    private String remark;
+
    /**
     * 社区自组织ID
     */
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java
@ -19,6 +19,7 @@ public class PartyActivityFormDTO implements Serializable {
    private static final long serialVersionUID = -2510068555703677L;
    @NotBlank(message = "组织Id不能为空" )
    private String agencyId;
+    private String gridId;
    private String unitId;
    private String title;
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/DraftActInfoFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/DraftActInfoFormDTO.java
@ -28,7 +28,7 @@ public class DraftActInfoFormDTO implements Serializable {
     * 活动草稿id,如果是编辑之前的活动草稿，此列是有值的
     */
    private String actDraftId;
-
+    private String gridId;

    /**
     * 如果是重新发布活动，此列是有值的
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInfoFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInfoFormDTO.java
@ -36,7 +36,7 @@ public class PublishActInfoFormDTO implements Serializable {
     * 活动草稿id,如果是编辑之前的活动草稿，此列是有值的
     */
    private String actDraftId;
-
+    private String gridId;
    /**
     * 客户id
     */
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/RePublishFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/RePublishFormDTO.java
@ -36,6 +36,8 @@ public class RePublishFormDTO implements Serializable {
     */
    private String actDraftId;

+    private String gridId;
+
    /**
     * 活动id
     */
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java
@ -53,6 +53,11 @@ public class CommunitySelfOrganizationListDTO implements Serializable {
     */
    private String organizationCreatedTime;

+    /**
+     * 备注
+     */
+    private String remark;
+
    /**
     * 经度
     */
@ -87,6 +92,7 @@ public class CommunitySelfOrganizationListDTO implements Serializable {
        this.longitude = "";
        this.latitude = "";
        this.orgId = "";
+        this.remark = "";
        this.score = NumConstant.ZERO;
        this.organizationPersonnel = new ArrayList<>();
    }
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActPreviewResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActPreviewResultDTO.java
@ -101,6 +101,9 @@ public class ActPreviewResultDTO implements Serializable {
     */
    private String actType;

+    private String gridId;
+    private String gridName;
+
    /**
     * 联建单位
     */
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActDetailResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActDetailResultDTO.java
@ -153,6 +153,8 @@ public class CanceledActDetailResultDTO implements Serializable {
     */
    private String actType;

+    private String gridId;
+    private String gridName;
    /**
     * 联建单位
     */
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActDetailResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActDetailResultDTO.java
@ -142,6 +142,9 @@ public class FinishedActDetailResultDTO implements Serializable {
     */
    private String actType;

+    private String gridId;
+    private String gridName;
+
    /**
     * 联建单位
     */
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActDetailResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActDetailResultDTO.java
@ -137,6 +137,9 @@ public class InProgressActDetailResultDTO implements Serializable {
     */
    private String actType;

+    private String gridId;
+    private String gridName;
+
    /**
     * 联建单位
     */
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/LatestDraftActInfoResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/LatestDraftActInfoResultDTO.java
@ -21,6 +21,7 @@ public class LatestDraftActInfoResultDTO implements Serializable {
     * 活动草稿id
     */
    private String actDraftId;
+    private String gridId;
    /**
     * 客户id
     */
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ReEditActInfoResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ReEditActInfoResultDTO.java
@ -154,6 +154,9 @@ public class ReEditActInfoResultDTO implements Serializable {
     */
    private String actType;

+    private String gridId;
+    private String gridName;
+
    /**
     * 联建单位
     */
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationEntity.java
@ -106,4 +106,9 @@ public class IcCommunitySelfOrganizationEntity extends BaseEpmetEntity {
     */
 	private String latitude;

+    /**
+     * 备注
+     */
+    private String remark;
+
 }
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivityEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivityEntity.java
@ -47,7 +47,7 @@ public class IcPartyActivityEntity extends BaseEpmetEntity {
     * 组织ID
     */
 	private String agencyId;
-
+	private String gridId;
    /**
     * 组织的所有上级
     */
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ExportCommunitySelfOrganizationExcel.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ExportCommunitySelfOrganizationExcel.java
@ -31,6 +31,9 @@ public class ExportCommunitySelfOrganizationExcel {
    @Excel(name = "创建时间", width = 20, needMerge = true)
    private String organizationCreatedTime;

+    @Excel(name = "备注", width = 60, needMerge = true)
+    private String remark;
+
    @ExcelCollection(name = "组织成员")
    private List<ImportCommunitySelfOrganizationSon> organizationPersonnel;

--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ImportCommunitySelfOrganization.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ImportCommunitySelfOrganization.java
@ -40,6 +40,9 @@ public class ImportCommunitySelfOrganization extends ExcelVerifyInfo {
    @Excel(name = "创建时间", needMerge = true)
    private String organizationCreatedTime;

+    @Excel(name = "备注", needMerge = true)
+    private String remark;
+
    @ExcelCollection(name = "组织成员")
    private List<ImportCommunitySelfOrganizationSon> persons;

--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java
@ -28,7 +28,9 @@ import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
@ -123,6 +125,12 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
                List<String> unitIds = Arrays.asList(dto.getUnitId().split(StrConstant.COMMA));
                List<String> unitNames = unitIds.stream().map(option::get).collect(Collectors.toList());
                dto.setUnitName(StringUtils.join(unitNames, StrConstant.COMMA));
+                if (StringUtils.isNotEmpty(dto.getGridId())) {
+                    GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
+                    if (null != gridInfo) {
+                        dto.setGridName(gridInfo.getGridName());
+                    }
+                }
            });
        }

@ -150,6 +158,12 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
                List<String> unitIds = Arrays.asList(dto.getUnitId().split(StrConstant.COMMA));
                List<String> unitNames = unitIds.stream().map(option::get).collect(Collectors.toList());
                dto.setUnitName(StringUtils.join(unitNames, StrConstant.COMMA));
+                if (StringUtils.isNotEmpty(dto.getGridId())) {
+                    GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
+                    if (null != gridInfo) {
+                        dto.setGridName(gridInfo.getGridName());
+                    }
+                }
            });
        }

@ -171,6 +185,12 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
        List<String> serviceNames = services.stream().map(categoryMap::get).collect(Collectors.toList());
        dto.setServiceMatterList(services);
        dto.setServiceMatterNameList(serviceNames);
+        if (StringUtils.isNotEmpty(dto.getGridId())) {
+            GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
+            if (null != gridInfo) {
+                dto.setGridName(gridInfo.getGridName());
+            }
+        }

        //获取单位
        //获取组织下联建单位
@ -547,6 +567,14 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
                List<String> services = Arrays.asList(dto.getServiceMatter().split(StrConstant.COMMA));
                List<String> serviceNames = services.stream().map(categoryMap::get).collect(Collectors.toList());
                dto.setServiceMatterName(StringUtils.join(serviceNames, StrConstant.SEMICOLON));
+
+                if (StringUtils.isNotEmpty(dto.getGridId())) {
+                    GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
+                    if (null != gridInfo) {
+                        dto.setGridName(gridInfo.getGridName());
+                    }
+                }
+
            });
        }
        PageInfo<IcPartyActivityDTO> pageInfo = new PageInfo<>(dtoList);
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java
@ -2,6 +2,8 @@ package com.epmet.service.impl;

 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.ActConstant;
@ -201,6 +203,13 @@ public class WorkActDraftServiceImpl implements WorkActDraftService {
                List<String> unitNames = unitIds.stream().map(option::get).collect(Collectors.toList());
                actPreviewResultDTO.setUnitIdList(unitIds);
                actPreviewResultDTO.setUnitNameList(unitNames);
+
+                if (StringUtils.isNotEmpty(actPreviewResultDTO.getGridId())) {
+                    GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(actPreviewResultDTO.getGridId());
+                    if (null != gridInfo) {
+                        actPreviewResultDTO.setGridName(gridInfo.getGridName());
+                    }
+                }
            }
        }
        return actPreviewResultDTO;
@ -337,7 +346,7 @@ public class WorkActDraftServiceImpl implements WorkActDraftService {

        latestActInfoDTO.setActType(formDTO.getActType());
        latestActInfoDTO.setTarget(formDTO.getTarget());
-
+        latestActInfoDTO.setGridId(formDTO.getGridId());
        return latestActInfoDTO;
    }

--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java
@ -9,6 +9,8 @@ import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.scan.param.ImgScanParamDTO;
 import com.epmet.commons.tools.scan.param.ImgTaskDTO;
 import com.epmet.commons.tools.scan.param.TextScanParamDTO;
@ -832,6 +834,14 @@ public class WorkActServiceImpl implements WorkActService {
                    List<String> unitNames = unitIds.stream().map(option::get).collect(Collectors.toList());
                    canceledActDetailResultDTO.setUnitIdList(unitIds);
                    canceledActDetailResultDTO.setUnitNameList(unitNames);
+
+                    if (StringUtils.isNotEmpty(dto.getGridId())) {
+                        canceledActDetailResultDTO.setGridId(dto.getGridId());
+                        GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
+                        if (null != gridInfo) {
+                            canceledActDetailResultDTO.setGridName(gridInfo.getGridName());
+                        }
+                    }
                }
            }
        }
@ -897,6 +907,14 @@ public class WorkActServiceImpl implements WorkActService {
                    List<String> unitNames = unitIds.stream().map(option::get).collect(Collectors.toList());
                    resultDTO.setUnitIdList(unitIds);
                    resultDTO.setUnitNameList(unitNames);
+
+                    if (StringUtils.isNotEmpty(dto.getGridId())) {
+                        resultDTO.setGridId(dto.getGridId());
+                        GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
+                        if (null != gridInfo) {
+                            resultDTO.setGridName(gridInfo.getGridName());
+                        }
+                    }
                }
            }
        }
@ -986,6 +1004,14 @@ public class WorkActServiceImpl implements WorkActService {
                    List<String> unitNames = unitIds.stream().map(option::get).collect(Collectors.toList());
                    resultDTO.setUnitIdList(unitIds);
                    resultDTO.setUnitNameList(unitNames);
+
+                    if (StringUtils.isNotEmpty(dto.getGridId())) {
+                        resultDTO.setGridId(dto.getGridId());
+                        GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
+                        if (null != gridInfo) {
+                            resultDTO.setGridName(gridInfo.getGridName());
+                        }
+                    }
                }
            }
        }
@ -1390,6 +1416,14 @@ public class WorkActServiceImpl implements WorkActService {
                List<String> unitNames = unitIds.stream().map(option::get).collect(Collectors.toList());
                resultDTO.setUnitIdList(unitIds);
                resultDTO.setUnitNameList(unitNames);
+
+                if (StringUtils.isNotEmpty(dto.getGridId())) {
+                    resultDTO.setGridId(dto.getGridId());
+                    GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
+                    if (null != gridInfo) {
+                        resultDTO.setGridName(gridInfo.getGridName());
+                    }
+                }
            }
        }

--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.13__add_column_remark.sql
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.13__add_column_remark.sql
@ -0,0 +1 @@
+alter table ic_community_self_organization add COLUMN REMARK VARCHAR(500) comment '备注' AFTER ORGANIZATION_CREATED_TIME;
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.14__activity_add_grid.sql
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.14__activity_add_grid.sql
@ -0,0 +1,4 @@
+ALTER TABLE `epmet_heart`.`ic_party_activity`
+    ADD COLUMN `GRID_ID` varchar(64) NULL COMMENT '网格ID' AFTER `AGENCY_ID`;
+ALTER TABLE `epmet_heart`.`latest_act_info`
+    ADD COLUMN `GRID_ID` varchar(64) NULL COMMENT '网格ID' AFTER `CUSTOMER_ID`;
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml
@ -14,6 +14,7 @@
            LONGITUDE = #{longitude},
            LATITUDE = #{latitude},
            ORGANIZATION_CREATED_TIME = #{organizationCreatedTime},
+            REMARK = #{remark},
            UPDATED_TIME = NOW(),
            UPDATED_BY = #{updatedBy}
        WHERE DEL_FLAG = 0
@ -52,7 +53,8 @@
            so.SERVICE_ITEM AS serviceItem,
            so.LONGITUDE AS longitude,
            so.LATITUDE AS latitude,
-            so.ID as orgId
+            so.ID as orgId,
+            so.remark
        FROM ic_community_self_organization so
        WHERE so.DEL_FLAG = 0
            AND so.ORG_ID = #{agencyId}
@ -60,6 +62,9 @@
            <if test="null != organizationName and organizationName != '' ">
                AND so.ORGANIZATION_NAME LIKE CONCAT('%',#{organizationName},'%')
            </if>
+            <if test="null != remark and remark != '' ">
+                AND so.REMARK LIKE CONCAT('%',#{remark},'%')
+            </if>
            <if test=" null != startTime and startTime != '' ">
                AND so.ORGANIZATION_CREATED_TIME <![CDATA[ >= ]]> #{startTime}
            </if>
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml
@ -49,6 +49,7 @@
    <select id="selectActivityList" resultType="com.epmet.entity.IcPartyActivityEntity" parameterType = "com.epmet.dto.form.PartyActivityFormDTO">
        SELECT
            a.ID,
+            a.GRID_ID,
            b.unitId,
            c.serviceMatter,
            TITLE,
@ -95,10 +96,14 @@
        WHERE
            a.DEL_FLAG = '0'
            AND a.AGENCY_ID = #{agencyId}
+            <if test='null != gridId and "" != gridId'>
+                AND a.GRID_ID = #{gridId}
+            </if>
            <if test='null != title and "" != title'>
                AND TITLE LIKE concat('%', #{title}, '%')
            </if>
            AND ACTIVITY_TIME BETWEEN #{startTime} AND #{endTime}
+        ORDER BY ACTIVITY_TIME DESC

    </select>

--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/self_org_import_template.xlsx
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/self_org_import_template.xlsx
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java
@ -79,9 +79,9 @@ public class IcHouseFormDTO implements Serializable {
    private String purpose;

    /**
-     * 1出租；0未出租
+     * 1：出租 0：自住  2：闲置
     */
-    @NotNull(message = "是否出租不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
+    @NotNull(message = "房屋状态不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
    private Integer rentFlag;

    /**
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java
@ -62,6 +62,10 @@ public class ListIcNeighborHoodFormDTO implements Serializable{
     * 房主电话
     */
    private String  ownerPhone;
+    /**
+     * 房屋状态 【1：出租 0：自住  2：闲置】
+     */
+    private String  rentFlag;
    /**
     * 数据类型【小区：neighbourHood，楼栋：building，房屋：house】
     */
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HousesNameResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HousesNameResultDTO.java
@ -0,0 +1,20 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/4/12 16:40
+ * @DESC
+ */
+@Data
+public class HousesNameResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -8643628706377635279L;
+
+    private String idCard;
+
+    private String houseName;
+}
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java
@ -3,8 +3,12 @@ package com.epmet.enums;
 import org.springframework.util.StringUtils;

 public enum HouseRentFlagEnums {
-    YES(1,"是"),
-    NO(0,"否");
+    //原有的房屋出租状态是否改为房屋状态【1：出租 0：自住  2：闲置】
+    /*YES(1,"是"),
+    NO(0,"否");*/
+    HOUSE_ZZ(0,"自住"),
+    HOUSE_CZ(1,"出租"),
+    HOUSE_XZ(2,"闲置");



--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
@ -605,4 +605,13 @@ public interface GovOrgOpenFeignClient {
     */
    @PostMapping("/gov/org/customerstaffgrid/getallstaffbygridid")
    Result<List<String>> getAllStaffByGridId(@RequestParam("gridId")String gridId);
+
+    /**
+     * Desc: 根据身份证查询房屋名
+     * @param idCards
+     * @author zxc
+     * @date 2022/4/12 16:42
+     */
+    @PostMapping("/gov/org/ichouse/houses-name")
+    Result<List<HousesNameResultDTO>> getHousesNameByIdCards(@RequestBody List<String> idCards);
 }
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
@ -393,4 +393,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
    public Result<List<String>> getAllStaffByGridId(String gridId) {
        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getAllStaffByGridId", gridId);
    }
+
+    @Override
+    public Result<List<HousesNameResultDTO>> getHousesNameByIdCards(List<String> idCards) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getHousesNameByIdCards", idCards);
+    }
 }
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java
@ -118,6 +118,18 @@ public class BuildingController {
        List<BuildingTreeLevelDTO> buildingTreeLevelDTOS =buildingService.treeList(tokenDTO.getCustomerId(), tokenDTO.getUserId());
        return new Result().ok(buildingTreeLevelDTOS);
    }
+
+    /**
+     * Desc: 根据前端方便，新开接口，只返回树的ID
+     * @param tokenDTO
+     * @author zxc
+     * @date 2022/4/12 15:20
+     */
+    @PostMapping("tree-ids")
+    public Result treeIds(@LoginUser TokenDto tokenDTO){
+        List<String> ids =buildingService.treeIds(tokenDTO.getCustomerId(), tokenDTO.getUserId());
+        return new Result().ok(ids);
+    }
    /**
     * 导出模板
     * @param response
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
@ -94,7 +94,7 @@ public class HouseController implements ResultDataResolver {
        IcNeighborHoodResultDTO icNeighborHoodResultDTO = houseService.listNeighborhood(null, formDTO.getBuildingId(), formDTO.getOwnerName(),
                                                                                formDTO.getOwnerPhone(), null,
                                                                    null, queryScene,
-                                                                                formDTO.getPageNo(), formDTO.getPageSize());
+                                                                                formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getId(),formDTO.getLevel(),formDTO.getRentFlag());
        return new Result().ok(icNeighborHoodResultDTO);

    }
@ -142,7 +142,7 @@ public class HouseController implements ResultDataResolver {
                null);

        IcNeighborHoodResultDTO icNeighborHoodResultDTO = houseService.listNeighborhood(loginUserDetail.getAgencyId(),null, null, null,
-                                neighborhoodName, buildingName, scene, formDTO.getPageNo(), formDTO.getPageSize());
+                                neighborhoodName, buildingName, scene, formDTO.getPageNo(), formDTO.getPageSize(),null,null,null);

        return new Result<IcNeighborHoodResultDTO>().ok(icNeighborHoodResultDTO);
    }
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java
@ -30,6 +30,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcHouseDTO;
 import com.epmet.dto.form.HouseFormDTO;
 import com.epmet.dto.result.HouseListResultDTO;
+import com.epmet.dto.result.HousesNameResultDTO;
 import com.epmet.service.IcHouseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@ -114,4 +115,15 @@ public class IcHouseController {
        return new Result<List<HouseListResultDTO>>().ok(icHouseService.getHouseList(tokenDto, formDTO));
    }

+    /**
+     * Desc: 根据身份证查询房屋名
+     * @param idCards
+     * @author zxc
+     * @date 2022/4/12 16:42
+     */
+    @PostMapping("houses-name")
+    public Result<List<HousesNameResultDTO>> getHousesNameByIdCards(@RequestBody List<String> idCards){
+        return new Result<List<HousesNameResultDTO>>().ok(icHouseService.getHousesNameByIdCards(idCards));
+    }
+
 }
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.result.HouseInfoDTO;
+import com.epmet.dto.result.HousesNameResultDTO;
 import com.epmet.dto.result.NeighborHoodManageDelResultDTO;
 import com.epmet.entity.IcHouseEntity;
 import com.epmet.excel.IcHouseExcel;
@ -38,7 +39,10 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
                                                 @Param("ownerPhone") String ownerPhone,
                                                 @Param("neighborHoodName") String neighborHoodName,
                                                 @Param("buildingName") String buildingName,
-                                                 @Param("queryScene") String queryScene);
+                                                 @Param("queryScene") String queryScene,
+                                                 @Param("id")String id,
+                                                 @Param("level")String level,
+                                                 @Param("rentFlag")String rentFlag);

    List<IcHouseExcel> searchAllHouse(@Param("house") IcHouseEntity house);

@ -92,4 +96,12 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
     */
    void houseUpdate(@Param("houses") List<ImportGeneralDTO> houses);

+    /**
+     * Desc: 根据身份证查询房屋名
+     * @param idCards
+     * @author zxc
+     * @date 2022/4/12 16:42
+     */
+    List<HousesNameResultDTO> getHousesNameByIdCards(@Param("idCards") List<String> idCards);
+
 }
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java
@ -57,6 +57,7 @@ public interface BuildingService {
    void addBuilding(String customerId, IcBulidingFormDTO formDTO);

    List<BuildingTreeLevelDTO> treeList(String customerId, String staffId);
+    List<String> treeIds(String customerId, String staffId);

    List<Integer> importExcel(String customerId, List<IcBuildingExcel> list, String staffId, List<Integer> numList);

--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java
@ -62,7 +62,10 @@ public interface HouseService {
                                             String buildingName,
                                             String queryScene,
                                             Integer pageNo,
-                                             Integer pageSize);
+                                             Integer pageSize,
+                                             String id,
+                                             String level,
+                                             String rentFlag);

    void exportBuildinginfo(ListIcNeighborHoodFormDTO formDTO, HttpServletResponse response) throws  Exception;

--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
@ -8,6 +8,7 @@ import com.epmet.dto.IcHouseDTO;
 import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.form.HouseFormDTO;
 import com.epmet.dto.result.HouseListResultDTO;
+import com.epmet.dto.result.HousesNameResultDTO;
 import com.epmet.entity.IcHouseEntity;

 import java.util.List;
@ -116,4 +117,12 @@ public interface IcHouseService extends BaseService<IcHouseEntity> {
     */
    void houseUpdate(List<ImportGeneralDTO> houses);

+    /**
+     * Desc: 根据身份证查询房屋名
+     * @param idCards
+     * @author zxc
+     * @date 2022/4/12 16:42
+     */
+    List<HousesNameResultDTO> getHousesNameByIdCards(List<String> idCards);
+
 }
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
@ -261,6 +261,45 @@ public class BuildingServiceImpl implements BuildingService {

    }

+    @Override
+    public List<String> treeIds(String customerId, String staffId) {
+        List<String> result = new ArrayList<>();
+        CustomerStaffInfoCacheResult agency = CustomerStaffRedis.getStaffInfo(customerId, staffId);
+        if(null == agency || StringUtils.isBlank(agency.getAgencyId())){
+            log.error("com.epmet.service.impl.BuildingServiceImpl.treeIds，没有找到工作人员所属的机关信息，用户Id：{}",staffId);
+            return new ArrayList<>();
+        }
+        //1.获取所在组织及下级组织
+        CustomerAgencyEntity customerAgency = customerAgencyDao.selectById(agency.getAgencyId());
+        List<CustomerAgencyEntity> customerAgencyList = icBuildingDao.selectAgencyChildrenList(agency.getAgencyId());
+        customerAgencyList.add(customerAgency);
+        if(CollectionUtils.isEmpty(customerAgencyList)){
+            return new ArrayList<>();
+        }
+        result.addAll(customerAgencyList.stream().map(m -> m.getId()).collect(Collectors.toList()));
+        List<BuildingTreeLevelDTO> agencyList = customerAgencyList.stream().map(item -> {
+            BuildingTreeLevelDTO buildingTreeLevelDTO = new BuildingTreeLevelDTO();
+            buildingTreeLevelDTO.setId(item.getId());
+            buildingTreeLevelDTO.setPId(item.getPid());
+            buildingTreeLevelDTO.setLabel(item.getOrganizationName());
+            buildingTreeLevelDTO.setLevel(item.getLevel());
+            buildingTreeLevelDTO.setLongitude(item.getLongitude());
+            buildingTreeLevelDTO.setLatitude(item.getLatitude());
+            buildingTreeLevelDTO.setChildren(new ArrayList<>());
+            //当前组织有几个下级组织
+            buildingTreeLevelDTO.setShowNum(StrConstant.EPMETY_STR);
+            return buildingTreeLevelDTO;
+        }).collect(Collectors.toList());
+        //2.获取组织所在网格
+        List<String> agencyIdList = customerAgencyList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList());
+        List<CustomerGridEntity> customerGridList = customerGridDao.selectList(new QueryWrapper<CustomerGridEntity>().lambda().in(CustomerGridEntity::getPid, agencyIdList));
+        if(CollectionUtils.isEmpty(customerGridList)){
+            return result;
+        }
+        result.addAll(customerGridList.stream().map(m -> m.getId()).collect(Collectors.toList()));
+        return result;
+    }
+
    @Override
    @Transactional(rollbackFor = Exception.class)
    public List<Integer> importExcel(String customerId, List<IcBuildingExcel> list, String staffId, List<Integer> numList) {
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
@ -258,7 +258,8 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
                                                    String buildingName,
                                                    String queryScene,
                                                    Integer pageNo,
-                                                    Integer pageSize) {
+                                                    Integer pageSize,
+                                                    String id,String level, String rentFlag) {
        IcNeighborHoodResultDTO result = new IcNeighborHoodResultDTO();
        //如果类型是house 查房屋
        //IPage<Map<String, Object>> resultMap = searchHouse(buildingId, ownerName, ownerPhone, neighborHoodName, buildingName, pageNo, pageSize);
@ -266,23 +267,15 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
        // 查询pids
        String pids = null;
        if (StringUtils.isNotBlank(ancestorAgencyId)) {
-            CustomerAgencyDTO agency = agencyservice.getAgencyById(ancestorAgencyId);
-
-            if (agency == null) {
-                throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "【社区查询-查询房屋列表】查询当前staff所属组织信息失败");
-            }
-
-
-            if (NumConstant.ZERO_STR.equals(agency.getPid())) {
-                pids = ancestorAgencyId;
-            } else {
-                pids = agency.getPids().concat(StrConstant.COLON).concat(ancestorAgencyId);
-            }
+            pids = getPids(ancestorAgencyId);
+        }
+        if (StringUtils.isNotBlank(level) && level.equals("agency")){
+            pids = getPids(ancestorAgencyId);
        }

        IPage<IcHouseEntity> page = new Page<IcHouseEntity>(pageNo,pageSize);

-        IPage<Map<String, Object>> mapIPage = icHouseDao.searchHouseByPage(page, pids, buildingId, ownerName, ownerPhone, neighborHoodName, buildingName, queryScene);
+        IPage<Map<String, Object>> mapIPage = icHouseDao.searchHouseByPage(page, pids, buildingId, ownerName, ownerPhone, neighborHoodName, buildingName, queryScene,id,level,rentFlag);
        List<Map<String, Object>> records = mapIPage.getRecords();
        records.forEach(item->{
            item.put("houseType", HouseTypeEnums.getTypeValue(item.get("houseTypeKey")));
@ -293,6 +286,22 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
        result.setList(records);
        return result;
    }
+    public String getPids(String agencyId){
+        String pids = null;
+        CustomerAgencyDTO agency = agencyservice.getAgencyById(agencyId);
+
+        if (agency == null) {
+            throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "【社区查询-查询房屋列表】查询当前staff所属组织信息失败");
+        }
+
+
+        if (NumConstant.ZERO_STR.equals(agency.getPid())) {
+            pids = agencyId;
+        } else {
+            pids = agency.getPids().concat(StrConstant.COLON).concat(agencyId);
+        }
+        return pids;
+    }

    @Override
    public void exportBuildinginfo(ListIcNeighborHoodFormDTO formDTO, HttpServletResponse response) throws Exception {
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
@ -19,6 +19,7 @@ import com.epmet.dto.IcResiUserDTO;
 import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.form.HouseFormDTO;
 import com.epmet.dto.result.HouseListResultDTO;
+import com.epmet.dto.result.HousesNameResultDTO;
 import com.epmet.entity.IcHouseEntity;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.OperCustomizeOpenFeignClient;
@ -231,4 +232,18 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
        baseDao.houseUpdate(houses);
    }

+    /**
+     * Desc: 根据身份证查询房屋名
+     * @param idCards
+     * @author zxc
+     * @date 2022/4/12 16:42
+     */
+    @Override
+    public List<HousesNameResultDTO> getHousesNameByIdCards(List<String> idCards) {
+        if (CollectionUtils.isEmpty(idCards)){
+            return new ArrayList<>();
+        }
+        return baseDao.getHousesNameByIdCards(idCards);
+    }
+
 }
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.15__alter_ic_house.sql
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.15__alter_ic_house.sql
@ -0,0 +1,2 @@
+ALTER TABLE `ic_house`
+MODIFY COLUMN `RENT_FLAG`  tinyint(1) NOT NULL COMMENT '1：出租 0：自住  2：闲置' AFTER `PURPOSE`;
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
@ -154,7 +154,10 @@
        b.BUILDING_NAME as buildingName,
        d.UNIT_NUM as unitNum,
        a.DOOR_NAME as doorName,
-        if(a.RENT_FLAG=1,'是','否') as rentFlag,
+        (case when a.RENT_FLAG = '0' then '自住'
+        when a.RENT_FLAG = '1' then '出租'
+        when a.RENT_FLAG = '2' then '闲置'
+        else '' end) as rentFlag,
        a.OWNER_NAME as ownerName,
        /*a.RENT_FLAG as rentFlag,
        a.PURPOSE as purpose,*/
@ -167,7 +170,7 @@
        a.BUILDING_UNIT_ID as unitNumKey,
        a.HOUSE_TYPE as houseTypeKey,
        a.PURPOSE as purposeKey,
-        a.RENT_FLAG as rentFlagKey,
+        CAST(a.RENT_FLAG AS CHAR) as rentFlagKey,
        c.AGENCY_ID as agencyId,
        c.GRID_ID as gridId
        from ic_house a
@ -175,16 +178,26 @@
        LEFT JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID and c.DEL_FLAG = '0'
        LEFT JOIN ic_building_unit d on a.BUILDING_UNIT_ID = d.ID and d.DEL_FLAG = '0'
        <where>
-                                            a.del_flag = '0'
+            a.del_flag = '0'
            <if test="pids != null and pids != ''">
-            and    case c.AGENCY_PIDS
-                    when '' then CONCAT(c.AGENCY_ID) like CONCAT(#{pids}, '%')
-                    else CONCAT(c.AGENCY_PIDS, ':', c.AGENCY_ID) like CONCAT(#{pids}, '%')
-                end
+            and case c.AGENCY_PIDS when '' then CONCAT(c.AGENCY_ID) like CONCAT(#{pids}, '%')
+                    else CONCAT(c.AGENCY_PIDS, ':', c.AGENCY_ID) like CONCAT(#{pids}, '%') end
            </if>
            <if test="buildingId != null and buildingId.trim() != ''">
                AND a.BUILDING_ID = #{buildingId}
            </if>
+            <if test='level == "grid"'>
+                AND c.GRID_ID = #{id}
+            </if>
+            <if test='level == "neighborHood"'>
+                AND c.id = #{id}
+            </if>
+            <if test='level == "build"'>
+                AND b.id = #{id}
+            </if>
+            <if test="rentFlag != null and rentFlag.trim() != ''">
+                AND a.RENT_FLAG = #{rentFlag}
+            </if>
            <if test="ownerName != null and ownerName.trim() != ''">
                AND a.OWNER_NAME like concat('%',#{ownerName},'%')
            </if>
@ -197,6 +210,9 @@
            <if test="buildingName != null and buildingName.trim() != ''">
                AND b.BUILDING_NAME like CONCAT('%',#{buildingName},'%')
            </if>
+            <if test="rentFlag != null and rentFlag.trim() != ''">
+                AND a.rent_flag = #{rentFlag}
+            </if>
        </where>
        /*排序规则：如果是社区查询则根据小区、楼栋、单元、房屋名字分别升序排序*/
        <choose>
@ -220,7 +236,7 @@
        a.DOOR_NAME as doorName,
        a.HOUSE_TYPE as houseType,
        a.PURPOSE as purpose,
-        if(a.RENT_FLAG=1,'是','否') as rentFlag,
+        if(a.RENT_FLAG=0,'自住',if(a.RENT_FLAG=1,'出租','闲置')) as rentFlag,
        a.OWNER_NAME as ownerName,
        a.OWNER_PHONE as ownerPhone,
        a.OWNER_ID_CARD as ownerIdCard,
@ -422,4 +438,22 @@
              </foreach>
            )
    </select>
+
+    <!-- 根据身份证查询房屋名 -->
+    <select id="getHousesNameByIdCards" resultType="com.epmet.dto.result.HousesNameResultDTO">
+        SELECT
+            h.OWNER_ID_CARD AS idCard,
+            CONCAT(nh.NEIGHBOR_HOOD_NAME,b.BUILDING_NAME,n.UNIT_NAME,h.DOOR_NAME) AS houseName
+        FROM ic_house h
+        INNER JOIN ic_neighbor_hood nh ON (nh.ID = h.NEIGHBOR_HOOD_ID AND nh.DEL_FLAG = '0')
+        INNER JOIN ic_building b ON (b.ID = h.BUILDING_ID AND b.DEL_FLAG = '0')
+        INNER JOIN ic_building_unit n ON (n.ID = h.BUILDING_UNIT_ID AND n.DEL_FLAG = '0')
+        WHERE h.DEL_FLAG = '0'
+          AND h.OWNER_ID_CARD IN (
+              <foreach collection="idCards" item="i" separator=",">
+                  #{i}
+              </foreach>
+            )
+        GROUP BY h.OWNER_ID_CARD
+    </select>
 </mapper>
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java
@ -44,6 +44,16 @@ public class IcResiCollectMemFormDTO implements Serializable {
    // @NotNull(message = "疫苗接种情况不能为空", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
    private Integer ymjz;

+    /**
+     * 户籍所在地
+     */
+    private String domicilePlace;
+
+    /**
+     * 学校或公司
+     */
+    private String workPlace;
+
    /**
     * 社区居民信息登记-查询返参用
     */
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java
@ -45,4 +45,15 @@ public class CollectListMemberExcelResultDTO implements Serializable {
    @Excel(name = "疫苗接种情况",replace = { "全程接种_1", "未全程接种_2", "未接种_0" }, width = 30)
    private String ymjz;

+    /**
+     * 户籍所在地
+     */
+    @Excel(name = "户籍所在地", width = 60)
+    private String domicilePlace;
+
+    /**
+     * 学校或公司
+     */
+    @Excel(name = "单位或学校", width = 60)
+    private String workPlace;
 }
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java
@ -69,6 +69,15 @@ public class CollectListResultDTO implements Serializable {
         */
        private Integer ymjz;

+        /**
+         * 户籍所在地
+         */
+        private String domicilePlace;
+
+        /**
+         * 学校或公司
+         */
+        private String workPlace;

    }
 }
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java
@ -92,5 +92,8 @@ public class StaffBasicInfoResultDTO implements Serializable {
 	 */
 	private String latitude;

-
+	/**
+	 * 地区编码全路径：例如：37,3702,370203,370203005,370203005015
+	 */
+	private List<String> areaCodePath;
 }
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java
@ -53,4 +53,13 @@ public class IcResiMemberEntity extends BaseEpmetEntity {
     */
 	private Integer ymjz;

+	/**
+	 * 户籍所在地
+	 */
+	private String domicilePlace;
+
+	/**
+	 * 学校或公司
+	 */
+	private String workPlace;
 }
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
@ -30,7 +30,9 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.security.password.PasswordUtils;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.CpUserDetailRedis;
@ -741,6 +743,8 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 				resultDTO.setLevel(staffInfo.getLevel());
 				resultDTO.setLongitude(staffInfo.getLongitude());
 				resultDTO.setLatitude(staffInfo.getLatitude());
+				AgencyInfoCache agency= CustomerOrgRedis.getAgencyInfo(staffInfo.getAgencyId());
+				resultDTO.setAreaCodePath(null != agency && !CollectionUtils.isEmpty(agency.getAreaCodePath()) ? agency.getAreaCodePath() : new ArrayList<>());
 			}
 			//获取工作人员所属客户名
 			CustomerDTO dto = new CustomerDTO();
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@ -1298,6 +1298,16 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
        }else if (formDTO.getAttentionType().equals(NumConstant.ONE)){
            list = baseDao.vaccineList(formDTO);
        }
+        List<String> idCards = list.stream().map(m -> m.getIdCard()).distinct().collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(idCards)){
+            Result<List<HousesNameResultDTO>> housesNameByIdCards = govOrgOpenFeignClient.getHousesNameByIdCards(idCards);
+            if (!housesNameByIdCards.success()){
+                throw new EpmetException("查询居民所属房屋失败...");
+            }
+            if (CollectionUtils.isNotEmpty(housesNameByIdCards.getData())){
+                list.forEach(l -> housesNameByIdCards.getData().stream().filter( h -> h.getIdCard().equals(l.getIdCard())).forEach(h -> l.setHouseName(h.getHouseName())));
+            }
+        }
        PageInfo<EpidemicPreventionResultDTO> pageInfo = new PageInfo<>(list);
        return new PageData<>(list, pageInfo.getTotal());
    }
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java
@ -220,6 +220,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
        dto.setChannel(Collections.emptyList());
        //关注类型，核酸检测：2，疫苗接种：1;行程上报：0
        dto.setAttentionType(NumConstant.TWO);
+        dto.setReason("有重点区域行程");
        list.add(dto);
        vaccinationAddFormDTO.setList(list);
        epidemicSpecialAttentionService.vaccinationAdd( vaccinationAddFormDTO);
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java
@ -136,9 +136,9 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl<IcUserChangeR
                }
                //类别变动添加 新增/减少后缀
                if ("category".equals(resultDto.getType())){
-                    String tempSuffix = "减少";
+                    String tempSuffix = "变更：减少";
                    if (resultDto.getValue().equals(NumConstant.ONE)){
-                        tempSuffix = "增加";
+                        tempSuffix = "变更：增加";
                    }
                    resultDto.setTypeName(resultDto.getTypeName().concat(tempSuffix));
                }
--- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.40__member_huji.sql
+++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.40__member_huji.sql
@ -0,0 +1,2 @@
+alter table ic_resi_member add COLUMN DOMICILE_PLACE VARCHAR(128) comment '户籍所在地' AFTER YMJZ;
+alter table ic_resi_member add COLUMN WORK_PLACE VARCHAR(128) comment '单位或学校' AFTER DOMICILE_PLACE;
--- a/epmet-user/epmet-user-server/src/main/resources/excel/attention_vaccination_template.xlsx
+++ b/epmet-user/epmet-user-server/src/main/resources/excel/attention_vaccination_template.xlsx
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml
@ -24,6 +24,7 @@
            a.`NAME`,
            a.MOBILE,
            a.ID_CARD,
+            a.reason,
            a.REMARK,
            IFNULL((SELECT DATE_FORMAT(CREATED_TIME,'%Y-%m-%d %H:%i:%s') FROM ic_notice WHERE DEL_FLAG = '0' AND ORIGIN = #{attentionType} AND ID_CARD = a.ID_CARD ORDER BY CREATED_TIME DESC LIMIT 1),'') AS lastInformTime,
            IFNULL(v.vaccinationCount,0) AS vaccinationCount
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml
@ -47,7 +47,9 @@
            m.ID_NUM AS memberIdNum,
            m.MOBILE AS memberMobile,
            m.HE_SUAN_COUNT AS heSuanCount,
-            m.YMJZ AS ymjz
+            m.YMJZ AS ymjz,
+            m.DOMICILE_PLACE as domicilePlace,
+            m.WORK_PLACE as workPlace
        from ic_resi_member m
        where m.DEL_FLAG = 0
        and m.IC_RESI_COLLECT_ID = #{id}
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiMemberDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiMemberDao.xml
@ -12,7 +12,9 @@
            m.ID_NUM,
            m.MOBILE,
            m.HE_SUAN_COUNT,
-            m.YMJZ
+            m.YMJZ,
+            m.DOMICILE_PLACE,
+            m.WORK_PLACE
        FROM
            ic_resi_member m
        WHERE
			`@ -0,0 +1 @@`
			`alter table ic_community_self_organization add COLUMN REMARK VARCHAR(500) comment '备注' AFTER ORGANIZATION_CREATED_TIME;`