diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
index 9035d81861..c65750548c 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
@@ -153,6 +153,8 @@ public enum EpmetErrorCode {
 	// 预约某事项在某时间段存在记录时
 	APPOINTMENT_TIME_ERROR(8527, "该时间段已被预约，请选择其他时间段"),
 
+	APPOINTMENT_ERROR(8528, "%s尚有未履行的预约存在，请确认后操作"),
+
     // 该错误不会提示给前端，只是后端传输错误信息用。
     ACCESS_SQL_FILTER_MISSION_ARGS(8701, "缺少生成权限过滤SQL所需参数"),
     OPER_ADD_CUSTOMER_ROOT_AGENCY_ERROR(8702, "添加客户根级组织失败"),
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
index fd0e6b1a06..1003009805 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
@@ -632,4 +632,5 @@ public class RedisKeys {
 	public static String getResiTempChangedKey(String customerId) {
 		return rootPrefix.concat("resi:").concat("export").concat(":template:changed").concat(customerId);
 	}
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
index d8e591ea31..fcdcf05349 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
@@ -163,7 +163,7 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
         baseDao.deleteByProjectId(param.getCustomerId(), item.getProjectId());
         screenProjectImgDataDao.deleteByProjectId(param.getCustomerId(), item.getProjectId());
         baseDao.insert(screenProjectDataEntity);
-        saveCategory(param.getCustomerId(), Collections.singletonList(screenProjectDataEntity))
+        saveCategory(param.getCustomerId(), Collections.singletonList(screenProjectDataEntity));
         //插入该项目图片表
         String[] projectImgUrl = item.getProjectImgUrl();
         if (ArrayUtils.isNotEmpty(projectImgUrl)) {
@@ -174,7 +174,7 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
                 screenProjectImgDataEntity.setProjectId(item.getProjectId());
                 screenProjectImgDataEntity.setProjectImgUrl(projectImgUrl[i]);
                 screenProjectImgDataEntity.setSort(i);
-                imgList.add(screenProjectImgDataEntity)
+                imgList.add(screenProjectImgDataEntity);
             }
             screenProjectImgDataDao.insertBatch(imgList);
         }
@@ -359,8 +359,12 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
                 if ("external".equals(categoryEntity.getCustomerType())) {
                     entity.setCategoryCode(categoryEntity.getEpmetCategoryCode());
                     CustomerProjectCategoryDictEntity parent = customerProjectCategoryDictService.getByCategoryCode(parentCustomer.getData(), categoryEntity.getEpmetCategoryCode());
-                    entity.setParentCategoryCode(parent.getParentCategoryCode());
-                    entity.setLevel(parent.getLevel());
+                    if (null != parent) {
+                        entity.setParentCategoryCode(parent.getParentCategoryCode());
+                        entity.setLevel(parent.getLevel());
+                    } else {
+                        log.error("未找到对应分类");
+                    }
                 } else {
                     entity.setCategoryCode(categoryEntity.getCategoryCode());
                     entity.setParentCategoryCode(categoryEntity.getParentCategoryCode());
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/BaseReportServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/BaseReportServiceImpl.java
index b00c8cace6..c6d884c32e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/BaseReportServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/BaseReportServiceImpl.java
@@ -1,7 +1,6 @@
 package com.epmet.service.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.constant.BaseReportConstant;
 import com.epmet.dao.stats.BaseReportDao;
 import com.epmet.dto.basereport.form.*;
 import com.epmet.service.BaseReportService;
@@ -60,7 +59,8 @@ public class BaseReportServiceImpl implements BaseReportService {
             } while (deleteNum > NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
-            baseReportDao.insertBatchAgencyRegUser(formDTO.getDataList());
+            ListUtils.partition(formDTO.getDataList(),NumConstant.ONE_HUNDRED)
+                    .forEach(part->baseReportDao.insertBatchAgencyRegUser(part);
         }
     }
 
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcSocietyOrgDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcSocietyOrgDTO.java
index 36ffcbe8a0..898b01df9d 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcSocietyOrgDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcSocietyOrgDTO.java
@@ -101,7 +101,7 @@ public class IcSocietyOrgDTO implements Serializable {
     /**
      * 维度
      */
-	private String dimension;
+	private String latitude;
 
     /**
      * 备注
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java
index c839c78a78..a1a12c71e6 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java
@@ -96,7 +96,7 @@ public class AddSocietyOrgFormDTO implements Serializable {
     /**
      * 维度
      */
-	private String dimension;
+	private String latitude;
     //token中userId
 	private String staffId;
 
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java
index 83c1523800..2acad633c0 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java
@@ -85,7 +85,7 @@ public class EditSocietyOrgFormDTO implements Serializable {
     /**
      * 维度
      */
-	private String dimension;
+	private String latitude;
     //token中userId
 	private String staffId;
 
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyUnitFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyUnitFormDTO.java
index 683cee2803..cf7841d93e 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyUnitFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyUnitFormDTO.java
@@ -15,6 +15,7 @@ import java.io.Serializable;
 public class PartyUnitFormDTO implements Serializable {
 
     private static final long serialVersionUID = 1256798619648265622L;
+    private String customerId;
     private String agencyId;
     private String unitName;
     private String serviceMatter;
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/GetListSocietyOrgResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/GetListSocietyOrgResultDTO.java
index a7139bdc1d..376078ab10 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/GetListSocietyOrgResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/GetListSocietyOrgResultDTO.java
@@ -67,7 +67,7 @@ public class GetListSocietyOrgResultDTO implements Serializable {
         //经度
         private String longitude;
         //维度
-        private String dimension;
+        private String latitude;
     }
 
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java
index 30b23d3ed6..277238e78d 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java
@@ -56,6 +56,6 @@ public class SocietyOrgListResultDTO implements Serializable {
     //经度
     private String longitude;
     //维度
-    private String dimension;
+    private String latitude;
 
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java
index 85fb59ec7b..05c8e2d10a 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java
@@ -32,7 +32,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
-import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
 
 
 /**
@@ -75,9 +76,19 @@ public class IcPartyActivityController {
     }
 
     @GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<IcPartyActivityDTO> list = icPartyActivityService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, IcPartyActivityExcel.class);
+    public void export(@RequestBody PartyActivityFormDTO formDTO, HttpServletResponse response) throws Exception {
+        List<IcPartyActivityDTO> list = icPartyActivityService.list(formDTO);
+        AtomicInteger i = new AtomicInteger(0);
+        List<IcPartyActivityExcel> excelList = list.stream().map(item -> {
+            IcPartyActivityExcel excel = new IcPartyActivityExcel();
+            excel.setIndex(i.getAndIncrement());
+            excel.setUnitName(item.getUnitName());
+            excel.setTitle(item.getTitle());
+            excel.setAddress(item.getAddress());
+            excel.setPeopleCount(item.getPeopleCount());
+            excel.setActivityTime(item.getActivityTime());
+            return excel;
+        }).collect(Collectors.toList());
+        ExcelUtils.exportExcelToTarget(response, null, excelList, IcPartyActivityExcel.class);
     }
-
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java
index 3a8fcf0142..1daacc73c7 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java
@@ -37,7 +37,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
-import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
 
 
 /**
@@ -54,7 +55,8 @@ public class IcPartyUnitController {
     private IcPartyUnitService icPartyUnitService;
 
     @PostMapping("list")
-    public Result<PageData<IcPartyUnitDTO>> search(@RequestBody PartyUnitFormDTO formDTO){
+    public Result<PageData<IcPartyUnitDTO>> search(@LoginUser TokenDto tokenDto, @RequestBody PartyUnitFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
         PageData<IcPartyUnitDTO> page = icPartyUnitService.search(formDTO);
         return new Result<PageData<IcPartyUnitDTO>>().ok(page);
     }
@@ -83,9 +85,24 @@ public class IcPartyUnitController {
     }
 
     @GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<IcPartyUnitDTO> list = icPartyUnitService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, IcPartyUnitExcel.class);
+    public void export(@RequestBody PartyUnitFormDTO formDTO, HttpServletResponse response) throws Exception {
+        List<IcPartyUnitDTO> list = icPartyUnitService.list(formDTO);
+        AtomicInteger i = new AtomicInteger(0);
+        List<IcPartyUnitExcel> excelList = list.stream().map(item -> {
+            IcPartyUnitExcel excel = new IcPartyUnitExcel();
+            excel.setIndex(i.getAndIncrement());
+            excel.setUnitName(item.getUnitName());
+            excel.setContact(item.getContact());
+            excel.setContactMobile(item.getContactMobile());
+            excel.setType(item.getType());
+            excel.setMemberCount(item.getMemberCount());
+            excel.setRemark(item.getRemark());
+            excel.setSatisfaction(item.getSatisfaction());
+            excel.setServiceMatter(String.join(String.valueOf((char)10), item.getServiceMatterList()));
+            return excel;
+        }).collect(Collectors.toList());
+
+        ExcelUtils.exportExcelToTarget(response, null, excelList, IcPartyUnitExcel.class);
     }
 
     /**
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java
index 3c564349cb..569156783f 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java
@@ -101,7 +101,7 @@ public class IcSocietyOrgEntity extends BaseEpmetEntity {
     /**
      * 维度
      */
-	private String dimension;
+	private String latitude;
 
     /**
      * 备注
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityExcel.java
index 4dd9c4d87c..f2b54f5a36 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityExcel.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityExcel.java
@@ -31,32 +31,17 @@ import java.util.Date;
 @Data
 public class IcPartyActivityExcel {
 
-    @Excel(name = "主键")
-    private String id;
+    @Excel(name = "序号")
+    private Integer index;
 
-    @Excel(name = "客户id")
-    private String customerId;
-
-    @Excel(name = "组织ID")
-    private String agencyId;
-
-    @Excel(name = "组织的所有上级")
-    private String pids;
-
-    @Excel(name = "单位ID")
-    private String unitId;
-
-    @Excel(name = "服务事项")
-    private String serviceMatter;
+    @Excel(name = "单位名称")
+    private String unitName;
 
     @Excel(name = "活动标题")
     private String title;
 
-    @Excel(name = "活动目标")
-    private String target;
-
-    @Excel(name = "活动内容")
-    private String content;
+    @Excel(name = "活动地址")
+    private String address;
 
     @Excel(name = "服务人数")
     private Integer peopleCount;
@@ -64,35 +49,4 @@ public class IcPartyActivityExcel {
     @Excel(name = "活动时间")
     private Date activityTime;
 
-    @Excel(name = "活动地址")
-    private String address;
-
-    @Excel(name = "活动地址经度")
-    private String longitude;
-
-    @Excel(name = "活动地址纬度")
-    private String latitude;
-
-    @Excel(name = "活动结果")
-    private String result;
-
-    @Excel(name = "删除标识 0未删除、1已删除")
-    private String 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-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyUnitExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyUnitExcel.java
index ace9eff6b0..652542ef62 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyUnitExcel.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyUnitExcel.java
@@ -20,8 +20,6 @@ package com.epmet.excel;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * 联建单位
  *
@@ -31,28 +29,16 @@ import java.util.Date;
 @Data
 public class IcPartyUnitExcel {
 
-    @Excel(name = "主键")
-    private String id;
-
-    @Excel(name = "客户id")
-    private String customerId;
-
-    @Excel(name = "组织ID")
-    private String agencyId;
-
-    @Excel(name = "网格ID")
-    private String gridId;
-
-    @Excel(name = "")
-    private String pids;
+    @Excel(name = "序号")
+    private Integer index;
 
     @Excel(name = "单位名称")
     private String unitName;
 
-    @Excel(name = "分类 楼宇党建 两新组织 区域单位党建 机关直属部门 其他")
+    @Excel(name = "分类")
     private String type;
 
-    @Excel(name = "服务事项 多选逗号隔开")
+    @Excel(name = "服务事项")
     private String serviceMatter;
 
     @Excel(name = "联系人")
@@ -61,41 +47,12 @@ public class IcPartyUnitExcel {
     @Excel(name = "联系电话")
     private String contactMobile;
 
-    @Excel(name = "在职党员数")
+    @Excel(name = "在职党员")
     private Integer memberCount;
 
-    @Excel(name = "地址")
-    private String address;
-
-    @Excel(name = "中心位置经度")
-    private String longitude;
-
-    @Excel(name = "中心位置纬度")
-    private String latitude;
-
     @Excel(name = "群众满意度")
     private String satisfaction;
 
     @Excel(name = "备注")
     private String remark;
-
-    @Excel(name = "删除标识 0未删除、1已删除")
-    private String 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-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExcel.java
index 4d9089fa35..5f3d464dfb 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExcel.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExcel.java
@@ -71,7 +71,7 @@ public class IcSocietyOrgExcel {
     private String longitude;
 
     @Excel(name = "维度")
-    private String dimension;
+    private String latitude;
 
     @Excel(name = "备注")
     private String remarks;
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java
index def86c6c60..322201808e 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java
@@ -24,7 +24,6 @@ import com.epmet.dto.form.PartyActivityFormDTO;
 import com.epmet.entity.IcPartyActivityEntity;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 联建活动
@@ -47,12 +46,12 @@ public interface IcPartyActivityService extends BaseService<IcPartyActivityEntit
     /**
      * 默认查询
      *
-     * @param params
+     * @param formDTO
      * @return java.util.List<IcPartyActivityDTO>
      * @author generator
      * @date 2021-11-19
      */
-    List<IcPartyActivityDTO> list(Map<String, Object> params);
+    List<IcPartyActivityDTO> list(PartyActivityFormDTO formDTO);
 
     /**
      * 单条查询
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java
index de50d62319..c0bde53fb9 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java
@@ -26,7 +26,6 @@ import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.IcPartyUnitEntity;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 联建单位
@@ -49,12 +48,12 @@ public interface IcPartyUnitService extends BaseService<IcPartyUnitEntity> {
     /**
      * 默认查询
      *
-     * @param params
+     * @param formDTO
      * @return java.util.List<IcPartyUnitDTO>
      * @author generator
      * @date 2021-11-19
      */
-    List<IcPartyUnitDTO> list(Map<String, Object> params);
+    List<IcPartyUnitDTO> list(PartyUnitFormDTO formDTO);
 
     /**
      * 单条查询
diff --git 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
index bbf89dc290..2d3c6c81b2 100644
--- 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
@@ -83,10 +83,27 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
     }
 
     @Override
-    public List<IcPartyActivityDTO> list(Map<String, Object> params) {
-        List<IcPartyActivityEntity> entityList = baseDao.selectList(getWrapper(params));
+    public List<IcPartyActivityDTO> list(PartyActivityFormDTO formDTO) {
+        LambdaQueryWrapper<IcPartyActivityEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcPartyActivityEntity::getAgencyId, formDTO.getAgencyId());
+        wrapper.eq(StringUtils.isNotBlank(formDTO.getUnitId()), IcPartyActivityEntity::getUnitId, formDTO.getUnitId());
+        wrapper.eq(StringUtils.isNotBlank(formDTO.getServiceMatter()), IcPartyActivityEntity::getServiceMatter, formDTO.getServiceMatter());
+        wrapper.like(StringUtils.isNotBlank(formDTO.getTitle()), IcPartyActivityEntity::getTitle, formDTO.getTitle());
+        wrapper.between(IcPartyActivityEntity::getActivityTime, formDTO.getStartTime(), formDTO.getEndTime());
+        wrapper.orderByDesc(IcPartyActivityEntity::getUpdatedTime);
+        List<IcPartyActivityEntity> list = baseDao.selectList(wrapper);
+        List<IcPartyActivityDTO> dtoList = ConvertUtils.sourceToTarget(list, IcPartyActivityDTO.class);
+
+        IcPartyUnitDTO unitDTO = new IcPartyUnitDTO();
+        unitDTO.setAgencyId(formDTO.getAgencyId());
+        if (CollectionUtils.isNotEmpty(dtoList)) {
+            Map<String, String> option = icPartyUnitService.option(unitDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel));
+            dtoList.forEach(dto -> {
+                dto.setUnitName(option.get(dto.getUnitId()));
+            });
+        }
 
-        return ConvertUtils.sourceToTarget(entityList, IcPartyActivityDTO.class);
+        return dtoList;
     }
 
     private QueryWrapper<IcPartyActivityEntity> getWrapper(Map<String, Object> params){
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
index 7de26379e3..4c28cbbe90 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
@@ -33,16 +33,17 @@ import com.epmet.dto.IcPartyUnitDTO;
 import com.epmet.dto.IcUserDemandRecDTO;
 import com.epmet.dto.form.PartyUnitFormDTO;
 import com.epmet.dto.form.demand.ServiceQueryFormDTO;
+import com.epmet.dto.form.demand.SubCodeFormDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.IcPartyUnitEntity;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
 import com.epmet.service.IcPartyUnitService;
+import com.epmet.service.IcResiDemandDictService;
 import com.epmet.service.IcUserDemandRecService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -61,8 +62,10 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
 
     @Resource
     private EpmetAdminOpenFeignClient epmetAdminOpenFeignClient;
-    @Autowired
+    @Resource
     private IcUserDemandRecService icUserDemandRecService;
+    @Resource
+    private IcResiDemandDictService icResiDemandDictService;
 
 
     @Override
@@ -79,11 +82,17 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
         List<IcPartyUnitEntity> list = baseDao.selectList(wrapper);
         List<IcPartyUnitDTO> dtoList = ConvertUtils.sourceToTarget(list, IcPartyUnitDTO.class);
         Result<Map<String, String>> unitTypeMap =  epmetAdminOpenFeignClient.dictMap(DictTypeEnum.PARTY_UNIT_TYPE.getCode());
+        SubCodeFormDTO codeFormDTO = new SubCodeFormDTO();
+        codeFormDTO.setCustomerId(formDTO.getCustomerId());
+        codeFormDTO.setParentCategoryCode("1010");
+        Map<String, String> categoryMap = icResiDemandDictService.querySubCodeList(codeFormDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel));
         dtoList.forEach(item -> {
             item.setType(unitTypeMap.getData().get(item.getType()));
-            //TODO 服务事项
             if (StringUtils.isNotBlank(item.getServiceMatter())) {
                 List<String> matters = Arrays.asList(item.getServiceMatter().split(StrConstant.COMMA));
+                item.setServiceMatterList(matters.stream().map(categoryMap::get).collect(Collectors.toList()));
+            } else {
+                item.setServiceMatterList(new ArrayList<>());
             }
         });
         PageInfo<IcPartyUnitDTO> pageInfo = new PageInfo<>(dtoList);
@@ -91,10 +100,32 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
     }
 
     @Override
-    public List<IcPartyUnitDTO> list(Map<String, Object> params) {
-        List<IcPartyUnitEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, IcPartyUnitDTO.class);
+    public List<IcPartyUnitDTO> list(PartyUnitFormDTO formDTO) {
+        LambdaQueryWrapper<IcPartyUnitEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcPartyUnitEntity::getAgencyId, formDTO.getAgencyId());
+        wrapper.like(StringUtils.isNotBlank(formDTO.getUnitName()), IcPartyUnitEntity::getUnitName, formDTO.getUnitName());
+        wrapper.eq(StringUtils.isNotBlank(formDTO.getServiceMatter()), IcPartyUnitEntity::getServiceMatter, formDTO.getServiceMatter());
+        wrapper.eq(StringUtils.isNotBlank(formDTO.getType()), IcPartyUnitEntity::getType, formDTO.getType());
+        wrapper.like(StringUtils.isNotBlank(formDTO.getContact()), IcPartyUnitEntity::getContact, formDTO.getContact());
+        wrapper.like(StringUtils.isNotBlank(formDTO.getContactMobile()), IcPartyUnitEntity::getContactMobile, formDTO.getContactMobile());
+        wrapper.orderByDesc(IcPartyUnitEntity::getUpdatedTime);
+        List<IcPartyUnitEntity> list = baseDao.selectList(wrapper);
+        List<IcPartyUnitDTO> dtoList = ConvertUtils.sourceToTarget(list, IcPartyUnitDTO.class);
+        Result<Map<String, String>> unitTypeMap =  epmetAdminOpenFeignClient.dictMap(DictTypeEnum.PARTY_UNIT_TYPE.getCode());
+        SubCodeFormDTO codeFormDTO = new SubCodeFormDTO();
+        codeFormDTO.setCustomerId(formDTO.getCustomerId());
+        codeFormDTO.setParentCategoryCode("1010");
+        Map<String, String> categoryMap = icResiDemandDictService.querySubCodeList(codeFormDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel));
+        dtoList.forEach(item -> {
+            item.setType(unitTypeMap.getData().get(item.getType()));
+            if (StringUtils.isNotBlank(item.getServiceMatter())) {
+                List<String> matters = Arrays.asList(item.getServiceMatter().split(StrConstant.COMMA));
+                item.setServiceMatterList(matters.stream().map(categoryMap::get).collect(Collectors.toList()));
+            } else {
+                item.setServiceMatterList(new ArrayList<>());
+            }
+        });
+        return dtoList;
     }
 
     private QueryWrapper<IcPartyUnitEntity> getWrapper(Map<String, Object> params){
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml
index 4c91e2e3e7..a4685af4ce 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml
@@ -16,7 +16,7 @@
             admin_staff_id adminStaffId,
             address address,
             longitude longitude,
-            dimension dimension
+            latitude latitude
         FROM
             ic_society_org
         WHERE
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddPlacePatrolTeamFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddPlacePatrolTeamFormDTO.java
index b4767e0315..a0ece62eb1 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddPlacePatrolTeamFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddPlacePatrolTeamFormDTO.java
@@ -106,7 +106,7 @@ public class AddPlacePatrolTeamFormDTO implements Serializable {
      * 分队成员信息
      */
     @Valid
-    @NotEmpty(message = "成员列表不能为空")
+    @NotEmpty(message = "成员列表不能为空", groups = {Add.class})
     private List<Member> memberList;
 
     //token中userId
@@ -115,7 +115,7 @@ public class AddPlacePatrolTeamFormDTO implements Serializable {
     public interface Add { }
 
     @Data
-    public class Member {
+    public static class Member {
         //姓名
         private String name;
         //联系电话
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditPartyServiceCenterFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditPartyServiceCenterFormDTO.java
index 1bdb9886c3..d292fa6ae2 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditPartyServiceCenterFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditPartyServiceCenterFormDTO.java
@@ -80,7 +80,12 @@ public class EditPartyServiceCenterFormDTO implements Serializable {
     private String partyServiceCenterId;
 
     /**
-     * 可预约事项
+     * 新增的可预约事项
      */
     private List<IcPartyServiceCenterMatterDTO> matterList;
+
+    /**
+     * 要删除的事项
+     */
+    private List<String> delMatterList;
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditPlacePatrolTeamFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditPlacePatrolTeamFormDTO.java
index 8036d2dd12..4509c6f443 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditPlacePatrolTeamFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditPlacePatrolTeamFormDTO.java
@@ -35,6 +35,11 @@ import java.util.List;
 public class EditPlacePatrolTeamFormDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+    private String customerId;
     /**
      * 分队Id
      */
@@ -99,7 +104,7 @@ public class EditPlacePatrolTeamFormDTO implements Serializable {
     }
 
     @Data
-    public class Member {
+    public static class Member {
         //姓名
         private String name;
         //联系电话
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlacePatrolReviewRecordFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlacePatrolReviewRecordFormDTO.java
index 596bad17d4..225962bb89 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlacePatrolReviewRecordFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlacePatrolReviewRecordFormDTO.java
@@ -32,9 +32,9 @@ import java.io.Serializable;
 public class GetListPlacePatrolReviewRecordFormDTO implements Serializable {
     private static final long serialVersionUID = 1L;
     //巡查记录Id
+    @NotBlank(message = "巡查记录Id不能为空", groups = {GetData.class})
     private String placePatrolRecordId;
     //复查记录Id
-    @NotBlank(message = "复查记录Id不能为空", groups = {GetData.class})
     private String placePatrolReviewRecordId;
     //页码
     @Min(1)
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AppointmentExistRecordResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AppointmentExistRecordResultDTO.java
new file mode 100644
index 0000000000..ffb4d74c20
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AppointmentExistRecordResultDTO.java
@@ -0,0 +1,28 @@
+package com.epmet.dto.result;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/11/23 10:45 上午
+ * @DESC
+ */
+@Data
+public class AppointmentExistRecordResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 6651436509788141940L;
+
+    /**
+     * 事项名
+     */
+    private String matterName;
+
+    private String matterId;
+
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolTeamController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolTeamController.java
index 6d62a5f951..815505c2e9 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolTeamController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolTeamController.java
@@ -68,6 +68,7 @@ public class IcPlacePatrolTeamController {
     @PostMapping("edit")
     public Result edit(@LoginUser TokenDto tokenDto, @RequestBody EditPlacePatrolTeamFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, EditPlacePatrolTeamFormDTO.Edit.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
         placePatrolTeamService.edit(formDTO);
         return new Result();
     }
@@ -79,7 +80,7 @@ public class IcPlacePatrolTeamController {
     @PostMapping("del")
     public Result del(@LoginUser TokenDto tokenDto, @RequestBody EditPlacePatrolTeamFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, EditPlacePatrolTeamFormDTO.Del.class);
-        placePatrolTeamService.del(formDTO.getTeamId());
+        placePatrolTeamService.del(tokenDto.getUserId(), formDTO.getTeamId());
         return new Result();
     }
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcMatterAppointmentRecordDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcMatterAppointmentRecordDao.java
index f8c02d5429..f349032024 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcMatterAppointmentRecordDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcMatterAppointmentRecordDao.java
@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.AppointmentExistRecordResultDTO;
 import com.epmet.dto.result.AppointmentRecordResultDTO;
 import com.epmet.entity.IcMatterAppointmentRecordEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -43,4 +44,12 @@ public interface IcMatterAppointmentRecordDao extends BaseDao<IcMatterAppointmen
      */
     List<AppointmentRecordResultDTO> appointmentRecord(@Param("matterId")String matterId,@Param("date")String date);
 
+    /**
+     * @Description  查询事项是不是存在预约记录
+     * @param matterIds
+     * @author zxc
+     * @date 2021/11/23 3:48 下午
+     */
+    List<AppointmentExistRecordResultDTO> appointmentExistRecord(@Param("matterIds")List<String> matterIds);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlacePatrolTeamStaffDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlacePatrolTeamStaffDao.java
index 56dee8582f..8f8df8c9dd 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlacePatrolTeamStaffDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlacePatrolTeamStaffDao.java
@@ -51,4 +51,10 @@ public interface IcPlacePatrolTeamStaffDao extends BaseDao<IcPlacePatrolTeamStaf
      * @Description 批量查询分队下人员信息
      **/
     List<IcPlacePatrolTeamStaffDTO> selectByTeamIds(@Param("teamIds") List<String> teamIds);
+
+    /**
+     * @Author sun
+     * @Description 逻辑删除分队成员子表数据
+     **/
+    int upByTeamId(@Param("staffId") String staffId, @Param("teamId") String teamId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolTeamService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolTeamService.java
index 2c17403e80..6ec9cf1a96 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolTeamService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolTeamService.java
@@ -49,7 +49,7 @@ public interface IcPlacePatrolTeamService extends BaseService<IcPlacePatrolTeamE
      * @Author sun
      * @Description 删除九小场所巡查分队人员管理
      **/
-    void del(String teamId);
+    void del(String staffId, String teamId);
 
     /**
      * @Author sun
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolTeamStaffService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolTeamStaffService.java
index 32fd96e962..a622e03811 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolTeamStaffService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolTeamStaffService.java
@@ -43,4 +43,10 @@ public interface IcPlacePatrolTeamStaffService extends BaseService<IcPlacePatrol
      * @Description 查询分队下人员列表数据
      **/
     List<IcPlacePatrolTeamStaffDTO> getList(String teamId);
+
+    /**
+     * @Author sun
+     * @Description 逻辑删除分队成员子表数据
+     **/
+    void upByTeamId(String staffId, String teamId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java
index 382e65c112..6fd12822f0 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java
@@ -39,6 +39,7 @@ import com.epmet.dao.IcPartyServiceCenterDao;
 import com.epmet.dto.IcPartyServiceCenterDTO;
 import com.epmet.dto.TimeDTO;
 import com.epmet.dto.form.*;
+import com.epmet.dto.result.AppointmentExistRecordResultDTO;
 import com.epmet.dto.result.AppointmentRecordResultDTO;
 import com.epmet.dto.result.AppointmentTimeResultDTO;
 import com.epmet.dto.result.PartyServiceCenterListResultDTO;
@@ -200,6 +201,22 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
             });
             matterService.insertBatch(matters);
         }
+        // del matter
+        if (CollectionUtils.isNotEmpty(formDTO.getDelMatterList())){
+            List<String> delMatterList = formDTO.getDelMatterList();
+            List<AppointmentExistRecordResultDTO> existRecord = matterAppointmentRecordDao.appointmentExistRecord(delMatterList);
+            if (CollectionUtils.isNotEmpty(existRecord)){
+                StringBuffer sb = new StringBuffer();
+                existRecord.forEach(e -> {
+                    sb.append(e.getMatterName()).append(",");
+                });
+                String copywriter = sb.toString().substring(NumConstant.ZERO, sb.length() - NumConstant.ONE);
+                EpmetErrorCode.APPOINTMENT_ERROR.setMsg(String.format(EpmetErrorCode.APPOINTMENT_ERROR.getMsg(),copywriter));
+                throw new RenException(EpmetErrorCode.APPOINTMENT_ERROR.getCode());
+            }else {
+                matterService.deleteBatchIds(delMatterList);
+            }
+        }
     }
 
     /**
@@ -242,7 +259,7 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
             records.forEach(r -> {
                 timeIds.addAll(Arrays.asList(r.getTimeId().split(",")));
             });
-            if (timeIds.retainAll(Arrays.asList(formDTO.getTimeId().split(",")))){
+            if (timeIds.containsAll(Arrays.asList(formDTO.getTimeId().split(",")))){
                 throw new RenException(EpmetErrorCode.APPOINTMENT_TIME_ERROR.getCode());
             }
         }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java
index ab8d20776f..7cbc07b966 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java
@@ -112,7 +112,7 @@ public class IcPlacePatrolRecordServiceImpl extends BaseServiceImpl<IcPlacePatro
     @Override
     public PlacePatrolRecordDetailResultDTO detail(String placePatrolRecordId) {
         PlacePatrolRecordDetailResultDTO resultDTO = new PlacePatrolRecordDetailResultDTO();
-        //1.查询场所基础信息
+        //1.查询巡查记录信息
         GetListPlacePatrolRecordFormDTO dto = new GetListPlacePatrolRecordFormDTO();
         dto.setPlacePatrolRecordId(placePatrolRecordId);
         List<PlacePatrolRecordDetailResultDTO> result = baseDao.getList(dto);
@@ -127,12 +127,27 @@ public class IcPlacePatrolRecordServiceImpl extends BaseServiceImpl<IcPlacePatro
             throw new RenException("获取九小场所基本信息失败......");
         }
 
-        //3.封装九小场所数据
+        //3.查询所有分队下人员名单
+        List<String> teamIds = new ArrayList<>();
+        teamIds.add(resultDTO.getPlacePatrolTeamId());
+        List<IcPlacePatrolTeamStaffDTO> teamDTOList = icPlacePatrolTeamStaffDao.selectByTeamIds(teamIds);
+
+        //4.封装九小场所、分队成员数据
         for (OptionResultDTO n : nineList.getData()){
             if(resultDTO.getNinePlaceVal().equals(n.getValue())){
                 resultDTO.setNinePlaceName(n.getLabel());
             }
         }
+        //分队成员
+        StringBuffer inspectorsNames = new StringBuffer("");
+        for (String str : resultDTO.getInspectors().split(",")) {
+            teamDTOList.forEach(r -> {
+                if (str.equals(r.getId())) {
+                    inspectorsNames.append("".equals(inspectorsNames.toString().trim()) ? r.getName() : "," + r.getName());
+                }
+            });
+        }
+        resultDTO.setInspectorsNames(inspectorsNames.toString());
 
         return resultDTO;
     }
@@ -175,7 +190,7 @@ public class IcPlacePatrolRecordServiceImpl extends BaseServiceImpl<IcPlacePatro
             for (String str : dto.getInspectors().split(",")) {
                 teamDTOList.forEach(r -> {
                     if (str.equals(r.getId())) {
-                        inspectorsNames.append("".equals(inspectorsNames) ? r.getName() : "," + r.getName());
+                        inspectorsNames.append("".equals(inspectorsNames.toString().trim()) ? r.getName() : "," + r.getName());
                     }
                 });
             }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolReviewRecordServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolReviewRecordServiceImpl.java
index ae5463de04..7341c0012a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolReviewRecordServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolReviewRecordServiceImpl.java
@@ -153,7 +153,7 @@ public class IcPlacePatrolReviewRecordServiceImpl extends BaseServiceImpl<IcPlac
         for (String str : resultDTO.getInspectors().split(",")) {
             teamDTOList.forEach(r -> {
                 if (str.equals(r.getId())) {
-                    inspectorsNames.append("".equals(inspectorsNames) ? r.getName() : "," + r.getName());
+                    inspectorsNames.append("".equals(inspectorsNames.toString().trim()) ? r.getName() : "," + r.getName());
                 }
             });
         }
@@ -189,7 +189,7 @@ public class IcPlacePatrolReviewRecordServiceImpl extends BaseServiceImpl<IcPlac
             for (String str : dto.getInspectors().split(",")) {
                 teamDTOList.forEach(r -> {
                     if (str.equals(r.getId())) {
-                        inspectorsNames.append("".equals(inspectorsNames) ? r.getName() : "," + r.getName());
+                        inspectorsNames.append("".equals(inspectorsNames.toString().trim()) ? r.getName() : "," + r.getName());
                     }
                 });
             }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolTeamServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolTeamServiceImpl.java
index 4a73f3b5e0..c3e5ff7fa5 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolTeamServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolTeamServiceImpl.java
@@ -119,6 +119,7 @@ public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl<IcPlacePatrolT
             entity1.setMobile(m.getMobile());
             entityList.add(entity1);
         }
+        //物理删除
         placePatrolTeamStaffService.delByTeamId(formDTO.getTeamId());
         placePatrolTeamStaffService.insertBatch(entityList);
 
@@ -130,13 +131,13 @@ public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl<IcPlacePatrolT
      **/
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void del(String teamId) {
+    public void del(String staffId, String teamId) {
         //1.删除分队主表数据
         if (baseDao.deleteById(teamId) < NumConstant.ONE) {
             throw new RenException(String.format("删除九小场所下分队信息失败，分队Id->%s", teamId));
         }
-        //2.删除分队成员字表数据
-        placePatrolTeamStaffService.delByTeamId(teamId);
+        //2.逻辑删除分队成员字表数据
+        placePatrolTeamStaffService.upByTeamId(staffId, teamId);
     }
 
     /**
@@ -174,7 +175,7 @@ public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl<IcPlacePatrolT
         StringBuffer gridNames = new StringBuffer("");
         for (String str : resultDTO.getGridIds().split(",")) {
             gridList.forEach(r -> {
-                if (str.equals(r.getGridName())) {
+                if (str.equals(r.getId())) {
                     gridNames.append("".equals(gridNames) ? r.getGridName() : "," + r.getGridName());
                 }
             });
@@ -230,7 +231,7 @@ public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl<IcPlacePatrolT
             StringBuffer gridNames = new StringBuffer("");
             for (String str : dto.getGridIds().split(",")) {
                 gridList.forEach(r -> {
-                    if (str.equals(r.getGridName())) {
+                    if (str.equals(r.getId())) {
                         gridNames.append("".equals(gridNames) ? r.getGridName() : "," + r.getGridName());
                     }
                 });
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolTeamStaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolTeamStaffServiceImpl.java
index f8ca6fc890..8f26db929e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolTeamStaffServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolTeamStaffServiceImpl.java
@@ -48,9 +48,22 @@ public class IcPlacePatrolTeamStaffServiceImpl extends BaseServiceImpl<IcPlacePa
         return baseDao.delByTeamId(teamId);
     }
 
+    /**
+     * @Author sun
+     * @Description 查询分队下人员列表数据
+     **/
     @Override
     public List<IcPlacePatrolTeamStaffDTO> getList(String teamId) {
         return baseDao.getByTeamId(teamId);
     }
 
+    /**
+     * @Author sun
+     * @Description 逻辑删除分队成员子表数据
+     **/
+    @Override
+    public void upByTeamId(String staffId, String teamId) {
+        baseDao.upByTeamId(staffId, teamId);
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcMatterAppointmentRecordDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcMatterAppointmentRecordDao.xml
index c77ebceca6..0cdf818653 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcMatterAppointmentRecordDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcMatterAppointmentRecordDao.xml
@@ -18,4 +18,20 @@
           AND ar.APPOINTMENT_DATE = #{date}
           AND ar.`STATUS` = 'appointing'
     </select>
+
+    <!-- 查询事项是不是存在预约记录 -->
+    <select id="appointmentExistRecord" resultType="com.epmet.dto.result.AppointmentExistRecordResultDTO">
+        SELECT
+            cm.MATTER_NAME,
+            cm.id AS matterId
+        FROM ic_matter_appointment_record ar
+        LEFT JOIN ic_party_service_center_matter cm ON (cm.ID = ar.MATTER_ID AND cm.DEL_FLAG = 0)
+        WHERE ar.DEL_FLAG = 0
+          AND ar.`STATUS` = 'appointing'
+          AND ar.MATTER_ID IN
+            <foreach collection="matterIds" item="m" separator="," open="(" close=")">
+                #{m}
+            </foreach>
+        GROUP BY matterId
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml
index 4d04a72530..27514baefe 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml
@@ -8,7 +8,7 @@
             a.id placeOrgId,
             a.grid_id gridId,
             b.grid_name gridName,
-            a.nine_place_val ninePlaceVale,
+            a.nine_place_val ninePlaceVal,
             a.place_org_name placeOrgName,
             a.address address,
             a.scale scale,
@@ -28,8 +28,8 @@
         <if test="gridId != null and gridId.trim() != ''">
             AND a.grid_id = #{gridId}
         </if>
-        <if test="ninePlacsVal != null and ninePlacsVal.trim() != ''">
-            AND a.nine_place_val = #{ninePlacsVal}
+        <if test="ninePlaceVal != null and ninePlaceVal.trim() != ''">
+            AND a.nine_place_val = #{ninePlaceVal}
         </if>
         <if test="placeOrgName != null and placeOrgName.trim() != ''">
             AND a.place_org_name LIKE CONCAT('%', #{placeOrgName}, '%')
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolRecordDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolRecordDao.xml
index efde00da1e..597a62e186 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolRecordDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolRecordDao.xml
@@ -13,7 +13,7 @@
             c.place_org_name placeOrgName,
             a.place_patrol_team_id placePatrolTeamId,
             d.team_name placePatrolTeamName,
-            a.nine_placs_val ninePlaceVal,
+            a.nine_place_val ninePlaceVal,
             a.inspectors inspectors,
             a.first_time firstTime,
             a.first_result firstResult,
@@ -28,15 +28,17 @@
         LEFT JOIN ic_place_patrol_team d ON a.place_patrol_team_id = d.id
         WHERE
             a.del_flag = '0'
-        AND a.customer_id = ''
+        <if test="placePatrolRecordId != null and placePatrolRecordId.trim() != ''">
+            AND a.id = #{placePatrolRecordId}
+        </if>
         <if test="customerId != null and customerId.trim() != ''">
             AND a.customer_id = #{customerId}
         </if>
         <if test="gridId != null and gridId.trim() != ''">
             AND a.grid_id = #{gridId}
         </if>
-        <if test="ninePlacsVal != null and ninePlacsVal.trim() != ''">
-            AND a.nine_place_val = #{ninePlacsVal}
+        <if test="ninePlaceVal != null and ninePlaceVal.trim() != ''">
+            AND a.nine_place_val = #{ninePlaceVal}
         </if>
         <if test="placeOrgName != null and placeOrgName.trim() != ''">
             AND a.place_org_id IN (select id from ic_place_org where place_org_name like concat('%', #{placeOrgName}, '%'))
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolTeamDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolTeamDao.xml
index 99bbcb7886..a218d4f050 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolTeamDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolTeamDao.xml
@@ -6,7 +6,7 @@
     <resultMap id="teamList" type="com.epmet.dto.result.PlacePatrolTeamDetailResultDTO">
         <result property="teamId" column="id"/>
         <result property="gridIds" column="grid_ids"/>
-        <result property="ninePlaceVals" column="nine_placs_vals"/>
+        <result property="ninePlaceVals" column="nine_place_vals"/>
         <result property="teamName" column="team_name"/>
         <result property="plan" column="plan"/>
         <result property="time" column="time"/>
@@ -30,8 +30,8 @@
         <if test="gridId != null and gridId.trim() != ''">
             AND grid_ids LIKE CONCAT('%', #{gridId}, '%')
         </if>
-        <if test="ninePlacsVal != null and ninePlacsVal.trim() != ''">
-            AND nine_placs_vals LIKE CONCAT('%', #{ninePlacsVal}, '%')
+        <if test="ninePlaceVal != null and ninePlaceVal.trim() != ''">
+            AND nine_place_vals LIKE CONCAT('%', #{ninePlaceVal}, '%')
         </if>
         <if test="personInCharge != null and personInCharge.trim() != ''">
             AND person_in_charge LIKE CONCAT('%', #{personInCharge}, '%')
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolTeamStaffDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolTeamStaffDao.xml
index 7dddc8e731..06d8285f21 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolTeamStaffDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolTeamStaffDao.xml
@@ -36,4 +36,15 @@
             place_patrol_team_id ASC
     </select>
 
+    <update id="upByTeamId">
+        UPDATE
+            ic_place_patrol_team_staff
+        SET
+            del_flag = '1',
+            updated_by = #{staffId},
+            updated_time = NOW()
+        WHERE
+            place_patrol_team_id = #{teamId}
+    </update>
+
 </mapper>
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
index b2adb20543..f36d746475 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
@@ -670,13 +670,16 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
 
             ColumnWrapper columnWrapper = new ColumnWrapper();
 
+            String columnName = item.getColumnName();
+            Integer columnNum = item.getColumnNum();
+
             // 填充options
             columnWrapper.setItemType(item.getItemType());
             columnWrapper.setItemId(item.getItemId());
             String groupLabel = item.getGroupLabel();
             String combinedLabel = StringUtils.isBlank(groupLabel) ? item.getLabel() : groupLabel.concat(":").concat(item.getLabel());
             columnWrapper.setCombinedLabel(combinedLabel);
-            columnWrapper.setColumnName(item.getColumnName());
+            columnWrapper.setColumnName((columnNum == null || columnNum == 0) ? columnName : columnName + columnNum);
             columnWrapper.setColIndex(entry.getValue());
             columnWrapper.setRequired(item.getRequired());