diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventResultDTO.java
index b22d8a944b..fcb1a04d13 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventResultDTO.java
@@ -22,5 +22,6 @@ public class IcEventResultDTO {
     private String mobile;
     private String address;
     private String happenTime;
+    private String imgUrl;
 
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java
index 46d3acb93d..26e2b2895f 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java
@@ -657,10 +657,11 @@ public class IcEventController {
     @GetMapping("getEventListByManageStatus")
     public Result<List<IcEventResultDTO>> getEventListByTypeOrStatus(@RequestParam("orgId") String orgId,
                                                                      @RequestParam("orgType") String orgType,
+                                                                     @RequestParam("eventType") String eventType,
                                                                      @RequestParam("sourceType") String sourceType,
                                                                      @RequestParam("status") String status,
                                                                      @RequestParam("categoryCode") String categoryCode) {
-        return new Result<List<IcEventResultDTO>>().ok(icEventService.getListByStatus(orgId, orgType, sourceType, status,categoryCode));
+        return new Result<List<IcEventResultDTO>>().ok(icEventService.getListByStatus(orgId, orgType, eventType, sourceType, status, categoryCode));
     }
 
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java
index a1eb5c4f10..f79ece004f 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java
@@ -211,8 +211,9 @@ public interface IcEventDao extends BaseDao<IcEventEntity> {
                                      @Param("sourceType") String sourceType,
                                      @Param("manageType") String manageType);
 
-    List<IcEventResultDTO> getListByStatus(@Param("orgIdPath") String orgPath, @Param("sourceType") String sourceType,
-                                           @Param("status") String status, @Param("categoryCode") String categoryCode);
+    List<IcEventResultDTO> getListByStatus(@Param("orgIdPath") String orgPath, @Param("eventType") String eventType,
+                                           @Param("sourceType") String sourceType, @Param("status") String status,
+                                           @Param("categoryCode") String categoryCode);
 
     List<IcEventResultDTO> getListBySourceTypeOrEventType(@Param("orgIdPath") String orgPath,
                                                           @Param("sourceType") String sourceType, @Param("eventType") String eventType);
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java
index d212984b1c..094498ca54 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java
@@ -282,7 +282,7 @@ public interface IcEventService extends BaseService<IcEventEntity> {
      * @param status 事件处理状态
      * @return
      */
-    List<IcEventResultDTO> getListByStatus(String orgId, String orgType, String sourceType, String status,String categoryCode);
+    List<IcEventResultDTO> getListByStatus(String orgId, String orgType, String eventType,String sourceType, String status,String categoryCode);
 
     List<IcEventResultDTO> getListBySourceTypeOrEventType(String orgId, String orgType, String sourceType, String eventType);
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
index 64bd171199..5045a06e11 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
@@ -2049,8 +2049,8 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
     }
 
     @Override
-    public List<IcEventResultDTO> getListByStatus(String orgId, String orgType, String sourceType, String status, String categoryCode) {
-        return baseDao.getListByStatus(getOrgPath(orgId, orgType), sourceType, status, categoryCode);
+    public List<IcEventResultDTO> getListByStatus(String orgId, String orgType, String eventType, String sourceType, String status, String categoryCode) {
+        return baseDao.getListByStatus(getOrgPath(orgId, orgType), eventType, sourceType, status, categoryCode);
     }
 
     @Override
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
index 59bcd8c1b1..4f237fb01f 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
@@ -626,7 +626,8 @@
             e.LONGITUDE,
             e.EVENT_CONTENT AS eventContent,
             r.MANAGE_STATUS AS manageStatus,
-            c.CATEGORY_CODE AS categoryCode
+            c.CATEGORY_CODE AS categoryCode,
+            rea.ATTACHMENT_URL AS imgUrl
     </sql>
 
     <select id="getListByStatus" resultType="com.epmet.dto.result.IcEventResultDTO">
@@ -635,11 +636,15 @@
         FROM ic_event e
         LEFT JOIN ic_event_reply r ON r.IC_EVENT_ID = e.ID
         LEFT JOIN ic_event_category c ON c.IC_EVENT_ID = e.ID
+        LEFT JOIN ic_event_attachment rea ON rea.ic_event_id = e.ID AND rea.del_flag = '0'
         <where>
             e.DEL_FLAG = 0
             <if test="null != orgIdPath and orgIdPath != ''">
                 and e.GRID_PIDS LIKE concat(#{orgIdPath},'%')
             </if>
+            <if test="null != eventType and eventType != ''">
+                AND e.EVENT_TYPE = #{eventType}
+            </if>
             <if test="null != sourceType and sourceType != ''">
                 AND e.SOURCE_TYPE = #{sourceType}
             </if>
@@ -691,13 +696,13 @@
                 <where>
                     e.DEL_FLAG = 0
                     <if test="null != orgIds and orgIds.size >0">
-                        AND e.GRID_ID IN(
+                        AND e.AGENCY_ID IN(
                         <foreach collection="orgIds" item="orgId" separator=",">
                             #{orgId}
                         </foreach>)
                     </if>
                 </where>
-            GROUP BY e.GRID_ID
+            GROUP BY e.AGENCY_ID
         ) ea,
             (
                 SELECT count( e.id ) AS total  FROM ic_event e
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/DataSyncRecordMaritalPageFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/DataSyncRecordMaritalPageFormDTO.java
new file mode 100644
index 0000000000..3ad39e8ffb
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/DataSyncRecordMaritalPageFormDTO.java
@@ -0,0 +1,35 @@
+package com.epmet.dto.form.dataSync;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/10/13 14:16
+ */
+@Data
+public class DataSyncRecordMaritalPageFormDTO extends PageFormDTO {
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 身份证
+     */
+    private String idCard;
+
+    private String customerId;
+    /**
+     * 当前工作人员id
+     */
+    private String staffId;
+    /**
+     * 当前工作人员所属组织id
+     */
+    private String agencyId;
+
+    private String userId;
+}
+
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/DataSyncRecordMaritalPageResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/DataSyncRecordMaritalPageResultDTO.java
new file mode 100755
index 0000000000..82ad71b4c0
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/DataSyncRecordMaritalPageResultDTO.java
@@ -0,0 +1,72 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 数据同步记录-居民婚姻信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2023-05-18
+ */
+@Data
+public class DataSyncRecordMaritalPageResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+
+    /**
+     * 姓名
+     */
+	private String name;
+
+    /**
+     * 身份证
+     */
+	private String idCard;
+
+    /**
+     * 电话
+     */
+	private String mobile;
+
+    /**
+     * 居民Id，ic_resi_user.id
+     */
+	private String icResiUserId;
+
+    /**
+     * 婚姻状况
+     */
+	private String maritalStatusName;
+
+    /**
+     * 婚姻状况
+     */
+    private String maritalStatus;
+
+    /**
+     * 处理状态（更新至居民信息） 0:未处理；1:处理成功；2处理失败
+     */
+	private Integer dealStatus;
+
+    private String dealStatusName;
+
+    /**
+     * 处理结果
+     */
+	private String dealResult;
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordMaritalController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordMaritalController.java
index c06aea31d3..23fa9cf54a 100755
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordMaritalController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordMaritalController.java
@@ -1,19 +1,37 @@
 package com.epmet.controller;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.dto.DataSyncRecordDeathDTO;
 import com.epmet.dto.DataSyncRecordMaritalDTO;
+import com.epmet.dto.form.dataSync.DataSyncRecordDeathPageFormDTO;
+import com.epmet.dto.form.dataSync.DataSyncRecordDisabilityFormDTO;
+import com.epmet.dto.form.dataSync.DataSyncRecordMaritalPageFormDTO;
+import com.epmet.dto.result.DataSyncRecordMaritalPageResultDTO;
+import com.epmet.excel.DataSyncRecordMaritalExcel;
 import com.epmet.service.DataSyncRecordMaritalService;
+import lombok.extern.log4j.Log4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -24,6 +42,7 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2023-05-18
  */
+@Log4j
 @RestController
 @RequestMapping("dataSyncRecordMarital")
 public class DataSyncRecordMaritalController {
@@ -31,10 +50,12 @@ public class DataSyncRecordMaritalController {
     @Autowired
     private DataSyncRecordMaritalService dataSyncRecordMaritalService;
 
-    @RequestMapping("page")
-    public Result<PageData<DataSyncRecordMaritalDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<DataSyncRecordMaritalDTO> page = dataSyncRecordMaritalService.page(params);
-        return new Result<PageData<DataSyncRecordMaritalDTO>>().ok(page);
+    @PostMapping("page")
+    public Result<PageData<DataSyncRecordMaritalPageResultDTO>> page(@LoginUser TokenDto tokenDto, @RequestBody DataSyncRecordMaritalPageFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        PageData<DataSyncRecordMaritalPageResultDTO> page = dataSyncRecordMaritalService.page(formDTO);
+        return new Result<PageData<DataSyncRecordMaritalPageResultDTO>>().ok(page);
     }
 
     @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
@@ -69,4 +90,43 @@ public class DataSyncRecordMaritalController {
         return new Result();
     }
 
+    /**
+     * @Description: 导出
+     * @param tokenDto:
+     * @param formDTO:
+     * @param response:
+     * @Return void
+     * @Author: lichao
+     * @Date: 2023/5/22 16:18
+     */
+    @PostMapping("export")
+    public void export(@LoginUser TokenDto tokenDto, @RequestBody DataSyncRecordMaritalPageFormDTO formDTO, HttpServletResponse response) throws IOException {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        formDTO.setIsPage(false);
+        ExcelWriter excelWriter = null;
+        formDTO.setPageSize(NumConstant.TEN_THOUSAND);
+        int pageNo = formDTO.getPageNo();
+        try {
+            String today = DateUtils.format(new Date(), DateUtils.DATE_PATTERN_MMDD);
+            String fileName = "数据比对-婚姻数据".concat(today);
+            excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), DataSyncRecordMaritalExcel.class).build();
+            WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build();
+            PageData<DataSyncRecordMaritalPageResultDTO> data = null;
+            do {
+                data = dataSyncRecordMaritalService.page(formDTO);
+                formDTO.setPageNo(++pageNo);
+                excelWriter.write(data.getList(), writeSheet);
+            } while (org.apache.commons.collections4.CollectionUtils.isNotEmpty(data.getList()) && data.getList().size() == formDTO.getPageSize());
+
+        } catch (Exception e) {
+            log.error("export exception", e);
+        } finally {
+            // 千万别忘记finish 会帮忙关闭流
+            if (excelWriter != null) {
+                excelWriter.finish();
+            }
+        }
+    }
+
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordMaritalDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordMaritalDao.java
index 772a5728db..f6383bd19a 100755
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordMaritalDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordMaritalDao.java
@@ -1,8 +1,13 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.DataSyncRecordMaritalDTO;
+import com.epmet.dto.result.DataSyncRecordMaritalPageResultDTO;
 import com.epmet.entity.DataSyncRecordMaritalEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 数据同步记录-居民婚姻信息
@@ -12,5 +17,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface DataSyncRecordMaritalDao extends BaseDao<DataSyncRecordMaritalEntity> {
-	
+
+    List<DataSyncRecordMaritalPageResultDTO> pageSelect(@Param("customerId") String customerId, @Param("idCard") String idCard, @Param("name") String name, @Param("agencyId") String agencyId);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/DataSyncRecordMaritalExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/DataSyncRecordMaritalExcel.java
index 9a97b80380..b020ec8846 100755
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/DataSyncRecordMaritalExcel.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/DataSyncRecordMaritalExcel.java
@@ -1,6 +1,8 @@
 package com.epmet.excel;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import lombok.Data;
 
 import java.util.Date;
@@ -14,59 +16,27 @@ import java.util.Date;
 @Data
 public class DataSyncRecordMaritalExcel {
 
-    @Excel(name = "主键")
-    private String id;
-
-    @Excel(name = "客户Id")
-    private String customerId;
-
-    @Excel(name = "组织Id")
-    private String agencyId;
-
-    @Excel(name = "组织的pids 含agencyId本身")
-    private String pids;
-
-    @Excel(name = "网格ID")
-    private String gridId;
-
-    @Excel(name = "姓名")
+    /**
+     * 姓名
+     */
+    @ColumnWidth(10)
+    @ExcelProperty("姓名")
     private String name;
 
-    @Excel(name = "身份证")
+    @ColumnWidth(25)
+    @ExcelProperty("身份证")
     private String idCard;
 
-    @Excel(name = "电话")
-    private String mobile;
-
-    @Excel(name = "居民Id，ic_resi_user.id")
-    private String icResiUserId;
-
-    @Excel(name = "婚姻状况")
-    private String maritalStatusName;
+    @ColumnWidth(25)
+    @ExcelProperty("婚姻状况")
+    private String maritalStatus;
 
-    @Excel(name = "处理状态（更新至居民信息） 0:未处理；1:处理成功；2处理失败")
-    private Integer dealStatus;
+    @ColumnWidth(25)
+    @ExcelProperty("处理状态")
+    private String dealStatusName;
 
-    @Excel(name = "处理结果")
+    @ColumnWidth(25)
+    @ExcelProperty("处理结果")
     private String dealResult;
 
-    @Excel(name = "删除标识：0.未删除 1.已删除")
-    private Integer delFlag;
-
-    @Excel(name = "乐观锁")
-    private Integer revision;
-
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    @Excel(name = "创建时间")
-    private Date createdTime;
-
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    @Excel(name = "更新时间")
-    private Date updatedTime;
-
-
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordMaritalService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordMaritalService.java
index 078a98ca9f..cfa20ef2e9 100755
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordMaritalService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordMaritalService.java
@@ -5,9 +5,12 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.DataSyncRecordDeathDTO;
 import com.epmet.dto.DataSyncRecordMaritalDTO;
+import com.epmet.dto.form.dataSync.DataSyncRecordMaritalPageFormDTO;
+import com.epmet.dto.result.DataSyncRecordMaritalPageResultDTO;
 import com.epmet.entity.DataSyncRecordDeathEntity;
 import com.epmet.entity.DataSyncRecordMaritalEntity;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -22,12 +25,12 @@ public interface DataSyncRecordMaritalService extends BaseService<DataSyncRecord
     /**
      * 默认分页
      *
-     * @param params
+     * @param formDTO
      * @return PageData<DataSyncRecordMaritalDTO>
      * @author generator
      * @date 2023-05-18
      */
-    PageData<DataSyncRecordMaritalDTO> page(Map<String, Object> params);
+    PageData<DataSyncRecordMaritalPageResultDTO> page(DataSyncRecordMaritalPageFormDTO formDTO);
 
     /**
      * 默认查询
@@ -80,4 +83,5 @@ public interface DataSyncRecordMaritalService extends BaseService<DataSyncRecord
     void delete(String[] ids);
 
     DataSyncRecordMaritalDTO selectOne(LambdaQueryWrapper<DataSyncRecordMaritalEntity> queryWrapper);
+
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
index 44afdadf4d..dd4ac2d932 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
@@ -744,6 +744,9 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
                 if(StringUtils.isBlank(thirdResultData)){
                     continue;
                 }
+                if (thirdResultData.equals("INR:匹配不成功") || thirdResultData.equals("null:null")){
+                    continue;
+                }
 //                JSONObject thirdResultObject = JSON.parseObject(thirdResultData);
 
                 LambdaQueryWrapper<DataSyncRecordMaritalEntity> queryWrapper = new LambdaQueryWrapper<>();
@@ -1674,101 +1677,105 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
 
         List<NatUserInfoResultDTO> dbResiList = null;
 
+//        String scope="";
+        List<DataSyncScopeDTO> allScope = new ArrayList<>();
         for (DataSyncConfigDTO config : configData) {
+            allScope.addAll(config.getScopeList());
+        }
 
-            String scope = config.getScopeList().stream().map(DataSyncScopeDTO::getId).collect(Collectors.joining(","));
-
-            // 查询上一次定时任务 居民位置记录
-            LambdaQueryWrapper<IcResiUserTaskLogEntity> logEntityLambdaQueryWrapper = new LambdaQueryWrapper<IcResiUserTaskLogEntity>().eq(IcResiUserTaskLogEntity::getDataScope,scope).eq(IcResiUserTaskLogEntity::getType,"hunyin").orderByDesc(IcResiUserTaskLogEntity::getCreatedTime).last("limit 1");
-            IcResiUserTaskLogEntity logEntity = resiUserTaskLogDao.selectOne(logEntityLambdaQueryWrapper);
-            // userInfoResultDTOS 待处理的数据存放
-            List<NatUserInfoResultDTO> userInfoResultDTOS = new ArrayList<>();
-
-            boolean isNum = false;
-            int start = 0;
-            // 如果没有log数据  说明第一次进入循环
-            if (logEntity == null){
-                // 从0开始 优先获取规定的几个社区
-                userInfoResultDTOS = getNatUserInfoFromDbForSiWang(0,50000);
-                // 如果不满5000条数据 下面再从别的社区取 isNum = true
-                if (userInfoResultDTOS.size() < 50000){
-                    isNum = true;
-                }
-            }else{
-                // 如果有log数据 判断一下上次停留在特殊数据还是普通数据  1是特殊数据（优先的几个社区）
-                if (logEntity.getDataType() == 1){
-                    // 从上次停止的数据开始获取
-                    userInfoResultDTOS = getNatUserInfoFromDbForSiWang(logEntity.getDataCount(),50000);
-                    // 下面再从别的社区取 isNum = true 凑够50000
-                    isNum = true;
-                }else if (logEntity.getDataType() == 0){
-                    // 如果是普通数据  直接从次停留在特殊数据获取
-                    start = logEntity.getDataCount();
-                }
-
+//            String scope = config.getScopeList().stream().map(DataSyncScopeDTO::getId).collect(Collectors.joining(","));
+
+        // 查询上一次定时任务 居民位置记录
+        LambdaQueryWrapper<IcResiUserTaskLogEntity> logEntityLambdaQueryWrapper = new LambdaQueryWrapper<IcResiUserTaskLogEntity>().eq(IcResiUserTaskLogEntity::getType,"hunyin").orderByDesc(IcResiUserTaskLogEntity::getCreatedTime).last("limit 1");
+        // .eq(IcResiUserTaskLogEntity::getDataScope,scope)
+        IcResiUserTaskLogEntity logEntity = resiUserTaskLogDao.selectOne(logEntityLambdaQueryWrapper);
+        // userInfoResultDTOS 待处理的数据存放
+        List<NatUserInfoResultDTO> userInfoResultDTOS = new ArrayList<>();
+
+        boolean isNum = false;
+        int start = 0;
+        // 如果没有log数据  说明第一次进入循环
+        if (logEntity == null){
+            // 从0开始 优先获取规定的几个社区
+            userInfoResultDTOS = getNatUserInfoFromDbForSiWang(0,50000);
+            // 如果不满5000条数据 下面再从别的社区取 isNum = true
+            if (userInfoResultDTOS.size() < 50000){
+                isNum = true;
+            }
+        }else{
+            // 如果有log数据 判断一下上次停留在特殊数据还是普通数据  1是特殊数据（优先的几个社区）
+            if (logEntity.getDataType() == 1){
+                // 从上次停止的数据开始获取
+                userInfoResultDTOS = getNatUserInfoFromDbForSiWang(logEntity.getDataCount(),50000);
+                // 下面再从别的社区取 isNum = true 凑够50000
+                isNum = true;
+            }else if (logEntity.getDataType() == 0){
+                // 如果是普通数据  直接从次停留在特殊数据获取
+                start = logEntity.getDataCount();
             }
-            // 建立一个最后插入log的标志
-            IcResiUserTaskLogEntity newLog = new IcResiUserTaskLogEntity();
-            newLog.setCreatedTime(new Date());
-            newLog.setType("hunyin");
-            newLog.setDataScope(scope);
 
-            // 设置查询数据范围
-            formDTO.setOrgList(config.getScopeList());
-            DataSyncEnum anEnum = DataSyncEnum.getEnum(config.getDataCode());
-            // 如果true 说明之前获取过特殊数据了 把50000补完普通数据
-            if (isNum){
-                formDTO.setStart(start);
-                formDTO.setEnd(50000-userInfoResultDTOS.size());
-                dbResiList = getNatUserInfoFromDbLimit(formDTO);
+        }
+        // 建立一个最后插入log的标志
+        IcResiUserTaskLogEntity newLog = new IcResiUserTaskLogEntity();
+        newLog.setCreatedTime(new Date());
+        newLog.setType("hunyin");
+//        newLog.setDataScope(scope);
+
+        // 设置查询数据范围
+        formDTO.setOrgList(allScope);
+        DataSyncEnum anEnum = DataSyncEnum.getEnum(EpidemicConstant.DATA_CODE_MARITAL);
+        // 如果true 说明之前获取过特殊数据了 把50000补完普通数据
+        if (isNum){
+            formDTO.setStart(start);
+            formDTO.setEnd(50000-userInfoResultDTOS.size());
+            dbResiList = getNatUserInfoFromDbLimit(formDTO);
+            dbResiList.addAll(userInfoResultDTOS);
+            newLog.setDataType(0);
+            newLog.setDataCount(50000-dbResiList.size());
+        }else{
+            // false 说明之前没有获取过特殊数据了
+            formDTO.setStart(start);
+            formDTO.setEnd(start+50000);
+            dbResiList = getNatUserInfoFromDbLimit(formDTO);
+            // 如果不够五万了  从头再来
+            if (dbResiList.size()<50000){
+                // 特殊数据
+                userInfoResultDTOS = getNatUserInfoFromDbForSiWang(0,50000-dbResiList.size());
                 dbResiList.addAll(userInfoResultDTOS);
-                newLog.setDataType(0);
-                newLog.setDataCount(50000-dbResiList.size());
-            }else{
-                // false 说明之前没有获取过特殊数据了
-                formDTO.setStart(start);
-                formDTO.setEnd(start+50000);
-                dbResiList = getNatUserInfoFromDbLimit(formDTO);
-                // 如果不够五万了  从头再来
-                if (dbResiList.size()<50000){
-                    // 特殊数据
-                    userInfoResultDTOS = getNatUserInfoFromDbForSiWang(0,50000-dbResiList.size());
-                    dbResiList.addAll(userInfoResultDTOS);
-                    // 特殊数据不够 在获取普通数据
-                    if (dbResiList.size() < 50000){
-                        formDTO.setStart(0);
-                        formDTO.setEnd(50000-dbResiList.size());
-                        dbResiList.addAll(getNatUserInfoFromDbLimit(formDTO));
-                        newLog.setDataType(0);
-                        newLog.setDataCount(50000-dbResiList.size());
+                // 特殊数据不够 在获取普通数据
+                if (dbResiList.size() < 50000){
+                    formDTO.setStart(0);
+                    formDTO.setEnd(50000-dbResiList.size());
+                    dbResiList.addAll(getNatUserInfoFromDbLimit(formDTO));
+                    newLog.setDataType(0);
+                    newLog.setDataCount(50000-dbResiList.size());
 
-                    }else{
-                        newLog.setDataType(1);
-                        newLog.setDataCount(50000-dbResiList.size());
-                    }
                 }else{
-                    newLog.setDataType(0);
-                    newLog.setDataCount(start+50000);
+                    newLog.setDataType(1);
+                    newLog.setDataCount(50000-dbResiList.size());
                 }
+            }else{
+                newLog.setDataType(0);
+                newLog.setDataCount(start+50000);
             }
+        }
 
 
-            if (CollectionUtils.isEmpty(dbResiList)) {
-                continue;
-            }
-            switch (anEnum) {
-                case HUN_YIN:
-                    try {
-                        //查询正常状态的居民
-                        hunYin(dbResiList);
-                        resiUserTaskLogDao.insert(newLog);
-                        log.info("======hunyin信息拉取结束======");
-                    } catch (Exception e) {
-                        log.error("marry thread execute exception", e);
-                    }
-                default:
-                    log.warn("没有要处理的数据");
-            }
+/*        if (CollectionUtils.isEmpty(dbResiList)) {
+            continue;
+        }*/
+        switch (anEnum) {
+            case HUN_YIN:
+                try {
+                    //查询正常状态的居民
+                    hunYin(dbResiList);
+                    resiUserTaskLogDao.insert(newLog);
+                    log.info("======hunyin信息拉取结束======");
+                } catch (Exception e) {
+                    log.error("marry thread execute exception", e);
+                }
+            default:
+                log.warn("没有要处理的数据");
         }
 
     }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordMaritalServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordMaritalServiceImpl.java
index 417d6e6b18..1828da747f 100755
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordMaritalServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordMaritalServiceImpl.java
@@ -4,20 +4,27 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.DataSyncRecordMaritalDao;
 import com.epmet.dto.DataSyncRecordDeathDTO;
 import com.epmet.dto.DataSyncRecordMaritalDTO;
+import com.epmet.dto.form.dataSync.DataSyncRecordMaritalPageFormDTO;
+import com.epmet.dto.result.DataSyncRecordMaritalPageResultDTO;
 import com.epmet.entity.DataSyncRecordDeathEntity;
 import com.epmet.entity.DataSyncRecordMaritalEntity;
 import com.epmet.service.DataSyncRecordMaritalService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -32,12 +39,16 @@ import java.util.Map;
 public class DataSyncRecordMaritalServiceImpl extends BaseServiceImpl<DataSyncRecordMaritalDao, DataSyncRecordMaritalEntity> implements DataSyncRecordMaritalService {
 
     @Override
-    public PageData<DataSyncRecordMaritalDTO> page(Map<String, Object> params) {
-        IPage<DataSyncRecordMaritalEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, DataSyncRecordMaritalDTO.class);
+    public PageData<DataSyncRecordMaritalPageResultDTO> page(DataSyncRecordMaritalPageFormDTO formDTO) {
+
+        CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+        formDTO.setAgencyId(null != staffInfoCacheResult ? staffInfoCacheResult.getAgencyId() : null);
+        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage());
+        List<DataSyncRecordMaritalPageResultDTO> records = baseDao.pageSelect(formDTO.getCustomerId(),formDTO.getIdCard(), formDTO.getName(), formDTO.getAgencyId());
+
+        PageInfo<DataSyncRecordMaritalPageResultDTO> pi = new PageInfo<>(records);
+
+        return new PageData<>(records, pi.getTotal());
     }
 
     @Override
@@ -89,4 +100,5 @@ public class DataSyncRecordMaritalServiceImpl extends BaseServiceImpl<DataSyncRe
         return ConvertUtils.sourceToTarget(entity, DataSyncRecordMaritalDTO.class);
     }
 
+
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordMaritalDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordMaritalDao.xml
index 18a11ba5d5..694abb548a 100755
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordMaritalDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordMaritalDao.xml
@@ -24,5 +24,35 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <select id="pageSelect" resultType="com.epmet.dto.result.DataSyncRecordMaritalPageResultDTO">
+
+        select
+            d.ID,
+            d.IC_RESI_USER_ID,
+            d.NAME AS name,d.ID_CARD,
+            if(d.MARITAL_STATUS_NAME = 'IA:结婚','结婚',if(d.MARITAL_STATUS_NAME = 'IB:离婚','离婚','单身')) as maritalStatus,
+            if(d.DEAL_STATUS = 0,'未处理',if(d.DEAL_STATUS = 1,'已处理',''))  as dealStatusName,
+            d.DEAL_RESULT
+        from
+            data_sync_record_marital d
+        where
+        d.DEL_FLAG = '0'
+        and
+            d.MARITAL_STATUS_NAME!='INR:匹配不成功'
+        and
+             d.MARITAL_STATUS_NAME!='null:null'
+        AND d.CUSTOMER_ID = #{customerId}
+        <if test="agencyId != null and agencyId != ''">
+            AND d.PIDS LIKE concat( '%', #{agencyId}, '%' )
+        </if>
+        <if test="idCard != null and idCard != ''">
+            AND d.ID_CARD LIKE concat('%',#{idCard},'%')
+        </if>
+        <if test="name != null and name != ''">
+            AND d.`NAME` LIKE concat('%',#{name},'%')
+        </if>
+        ORDER BY
+        d.CREATED_TIME DESC
+    </select>
 
 </mapper>
\ No newline at end of file