diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/EpmetAdminOpenFeignClient.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/EpmetAdminOpenFeignClient.java
index bb8d12f49c..6d7e1124dd 100644
--- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/EpmetAdminOpenFeignClient.java
+++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/EpmetAdminOpenFeignClient.java
@@ -1,6 +1,8 @@
 package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.dto.form.DictListFormDTO;
+import com.epmet.commons.tools.dto.result.DictListResultDTO;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.result.CorsConfigResultDTO;
@@ -8,6 +10,7 @@ import com.epmet.feign.fallback.EpmetAdminOpenFeignClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
@@ -84,4 +87,7 @@ public interface EpmetAdminOpenFeignClient {
      */
     @PostMapping("/sys/dict/data/dictmap/{dictType}")
     Result<Map<String, String>> dictMap(@PathVariable("dictType") String dictType);
+
+    @PostMapping("/sys/dict/data/dictlist")
+    Result<List<DictListResultDTO>> dictList(@RequestBody DictListFormDTO formDTO);
 }
diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/fallback/EpmetAdminOpenFeignClientFallback.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/fallback/EpmetAdminOpenFeignClientFallback.java
index 139514d1f5..6c16e8f3ae 100644
--- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/fallback/EpmetAdminOpenFeignClientFallback.java
+++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/fallback/EpmetAdminOpenFeignClientFallback.java
@@ -1,6 +1,8 @@
 package com.epmet.feign.fallback;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.dto.form.DictListFormDTO;
+import com.epmet.commons.tools.dto.result.DictListResultDTO;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -46,4 +48,9 @@ public class EpmetAdminOpenFeignClientFallback implements EpmetAdminOpenFeignCli
     public Result<Map<String, String>> dictMap(String dictType) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_ADMIN_SERVER, "dictMap", dictType);
     }
+
+    @Override
+    public Result<List<DictListResultDTO>> dictList(DictListFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_ADMIN_SERVER, "dictList", formDTO);
+    }
 }
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionDataResultDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionDataResultDTO.java
new file mode 100644
index 0000000000..78f77a850b
--- /dev/null
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionDataResultDTO.java
@@ -0,0 +1,18 @@
+package com.epmet.commons.tools.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/12/8 14:50
+ */
+@Data
+public class OptionDataResultDTO implements Serializable {
+    private static final long serialVersionUID = 416877704759019210L;
+    private String label;
+    private String value;
+    private String code;
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java
index fc0d7555e3..a8c770f8e9 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java
@@ -69,7 +69,7 @@ public class IcPartyActivityDTO implements Serializable {
      */
     @NotBlank(message = "服务事项不能为空",groups = AddGroup.class)
 	private String serviceMatter;
-
+    private String serviceMatterName;
     /**
      * 活动标题
      */
@@ -97,7 +97,7 @@ public class IcPartyActivityDTO implements Serializable {
      * 活动时间
      */
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm")
 	private Date activityTime;
 
     /**
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java
index 40ac5563ac..1f108568e1 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java
@@ -4,6 +4,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -16,6 +17,7 @@ import java.util.Date;
 @Data
 public class PartyActivityFormDTO implements Serializable {
     private static final long serialVersionUID = -2510068555703677L;
+    @NotBlank(message = "组织Id不能为空" )
     private String agencyId;
     private String unitId;
     private String title;
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ActivityStatisticsDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ActivityStatisticsDTO.java
new file mode 100644
index 0000000000..a941c3eb8f
--- /dev/null
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ActivityStatisticsDTO.java
@@ -0,0 +1,16 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/12/9 16:05
+ */
+@Data
+public class ActivityStatisticsDTO implements Serializable {
+    private String unitCount;
+    private String activityCount;
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/PartyUnitDistributionResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/PartyUnitDistributionResultDTO.java
new file mode 100644
index 0000000000..e8ef54c842
--- /dev/null
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/PartyUnitDistributionResultDTO.java
@@ -0,0 +1,20 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/12/9 10:05
+ */
+@Data
+public class PartyUnitDistributionResultDTO implements Serializable {
+    private static final long serialVersionUID = -4066938451623510159L;
+    private String id;
+    private String name;
+    private String type;
+    private String longitude;
+    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 a17609835d..5071fd8710 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
@@ -29,6 +29,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.IcPartyActivityDTO;
 import com.epmet.dto.form.PartyActivityFormDTO;
+import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.excel.IcPartyActivityExcel;
 import com.epmet.service.IcPartyActivityService;
 import org.apache.commons.collections4.CollectionUtils;
@@ -117,4 +118,24 @@ public class IcPartyActivityController {
     public Result importData(@LoginUser TokenDto tokenDto, HttpServletResponse response, @RequestPart("file") MultipartFile file) throws IOException {
         return icPartyActivityService.importData(tokenDto, response, file);
     }
+
+    /**
+     * @Description 联建活动分类统计
+     * @Param formDTO
+     * @Return {@link Result< List< OptionDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/9 16:20
+     */
+    @PostMapping("statistics")
+    public Result<List<OptionDTO>> statistics(@RequestBody PartyActivityFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<List<OptionDTO>>().ok(icPartyActivityService.statistics(formDTO));
+    }
+
+    @PostMapping("activitylist")
+    public Result<PageData<IcPartyActivityDTO>> activityList(@LoginUser TokenDto tokenDto, @RequestBody PartyActivityFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO);
+        PageData<IcPartyActivityDTO> page = icPartyActivityService.getActivityList(tokenDto, formDTO);
+        return new Result<PageData<IcPartyActivityDTO>>().ok(page);
+    }
 }
\ 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 ec06c3bf5f..359e6b3657 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
@@ -19,6 +19,7 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
@@ -28,8 +29,10 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.IcPartyUnitDTO;
+import com.epmet.dto.form.PartyActivityFormDTO;
 import com.epmet.dto.form.PartyUnitFormDTO;
 import com.epmet.dto.form.demand.ServiceQueryFormDTO;
+import com.epmet.dto.result.PartyUnitDistributionResultDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.excel.IcPartyUnitExcel;
 import com.epmet.service.IcPartyUnitService;
@@ -150,4 +153,30 @@ public class IcPartyUnitController {
     public Result importData(@LoginUser TokenDto tokenDto, HttpServletResponse response, @RequestPart("file") MultipartFile file) throws IOException {
         return icPartyUnitService.importData(tokenDto, response, file);
     }
+
+    /**
+     * @Description 按类型统计单位数量
+     * @Param dto
+     * @Return {@link Result< List< OptionDataResultDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/8 14:52
+     */
+    @PostMapping("typestatistics")
+    public Result<List<OptionDataResultDTO>> typeStatistics(@RequestBody PartyActivityFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<List<OptionDataResultDTO>>().ok(icPartyUnitService.typeStatistics(formDTO));
+    }
+
+    /**
+     * @Description 联建单位分布
+     * @Param formDTO
+     * @Return {@link Result< List< PartyUnitDistributionResultDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/9 10:11
+     */
+    @PostMapping("distribution")
+    public Result<List<PartyUnitDistributionResultDTO>> distribution(@RequestBody PartyActivityFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<List<PartyUnitDistributionResultDTO>>().ok(icPartyUnitService.distribution(formDTO));
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivityDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivityDao.java
index c596572fee..bb7e41c2ed 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivityDao.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivityDao.java
@@ -18,6 +18,8 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.PartyActivityFormDTO;
+import com.epmet.dto.result.ActivityStatisticsDTO;
 import com.epmet.entity.IcPartyActivityEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -29,5 +31,14 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IcPartyActivityDao extends BaseDao<IcPartyActivityEntity> {
+
+    /**
+     * @Description 联建活动统计
+     * @Param formDTO
+     * @Return {@link ActivityStatisticsDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/12/9 16:06
+     */
+    ActivityStatisticsDTO getStatistics(PartyActivityFormDTO formDTO);
 	
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java
index caf1f6336c..e287499c48 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java
@@ -18,6 +18,8 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
+import com.epmet.dto.result.PartyUnitDistributionResultDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.IcPartyUnitEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -43,4 +45,22 @@ public interface IcPartyUnitDao extends BaseDao<IcPartyUnitEntity> {
     List<OptionDTO> selectListByAgencyId(@Param("agencyIds") List<String> agencyIds,
                                          @Param("unitName") String unitName,
                                          @Param("customerId")String customerId);
+
+    /**
+     * 单位分类统计
+     * @Param agencyId
+     * @Return {@link java.util.List<com.epmet.commons.tools.dto.result.OptionDataResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/8 15:25
+     */
+    List<OptionDataResultDTO> getTypeStatistics(@Param("agencyId")String agencyId);
+
+    /**
+     * @Description 联建单位分布
+     * @Param agencyId
+     * @Return {@link List< PartyUnitDistributionResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/9 14:24
+     */
+    List<PartyUnitDistributionResultDTO> getDistribution(@Param("agencyId")String agencyId);
 }
\ No newline at end of file
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 dc0ca8b8a9..c3931bbd0b 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
@@ -23,6 +23,7 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IcPartyActivityDTO;
 import com.epmet.dto.form.PartyActivityFormDTO;
+import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.IcPartyActivityEntity;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -98,4 +99,22 @@ public interface IcPartyActivityService extends BaseService<IcPartyActivityEntit
      * @Date 2021/11/29 11:01
      */
     Result importData(TokenDto tokenDto, HttpServletResponse response, MultipartFile file) throws IOException;
+
+    /**
+     * 联建活动统计
+     * @Param formDTO
+     * @Return {@link List< OptionDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/9 14:55
+     */
+    List<OptionDTO> statistics(PartyActivityFormDTO formDTO);
+
+    /**
+     * 联建活动统计列表
+     * @Param formDTO
+     * @Return {@link PageData< IcPartyActivityDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/9 16:24
+     */
+    PageData<IcPartyActivityDTO> getActivityList(TokenDto tokenDto, PartyActivityFormDTO formDTO);
 }
\ No newline at end of file
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 8106d724fe..ebb876072a 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
@@ -18,12 +18,15 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IcPartyUnitDTO;
+import com.epmet.dto.form.PartyActivityFormDTO;
 import com.epmet.dto.form.PartyUnitFormDTO;
 import com.epmet.dto.form.demand.ServiceQueryFormDTO;
+import com.epmet.dto.result.PartyUnitDistributionResultDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.IcPartyUnitEntity;
 import org.springframework.web.multipart.MultipartFile;
@@ -120,4 +123,22 @@ public interface IcPartyUnitService extends BaseService<IcPartyUnitEntity> {
      * @Date 2021/11/29 11:01
      */
     Result importData(TokenDto tokenDto, HttpServletResponse response, MultipartFile file) throws IOException;
+
+    /**
+     * @Description 按类型统计单位数量
+     * @Param formDTO
+     * @Return {@link List< OptionDataResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/8 14:56
+     */
+    List<OptionDataResultDTO> typeStatistics(PartyActivityFormDTO formDTO);
+
+    /**
+     * 联建单位分布
+     * @Param formDTO
+     * @Return {@link List< PartyUnitDistributionResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/9 10:10
+     */
+    List<PartyUnitDistributionResultDTO> distribution(PartyActivityFormDTO formDTO);
 }
\ No newline at end of file
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 213dacc377..cd80f55b72 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
@@ -36,6 +36,7 @@ import com.epmet.dto.IcPartyActivityDTO;
 import com.epmet.dto.IcPartyUnitDTO;
 import com.epmet.dto.form.PartyActivityFormDTO;
 import com.epmet.dto.form.demand.SubCodeFormDTO;
+import com.epmet.dto.result.ActivityStatisticsDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.IcPartyActivityEntity;
 import com.epmet.excel.IcPartyActivityImportExcel;
@@ -149,7 +150,13 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
     @Override
     public IcPartyActivityDTO get(String id) {
         IcPartyActivityEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, IcPartyActivityDTO.class);
+        SubCodeFormDTO codeFormDTO = new SubCodeFormDTO();
+        codeFormDTO.setCustomerId(entity.getCustomerId());
+        codeFormDTO.setParentCategoryCode("1010");
+        Map<String, String> categoryMap = icResiDemandDictService.querySubCodeList(codeFormDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel));
+        IcPartyActivityDTO dto = ConvertUtils.sourceToTarget(entity, IcPartyActivityDTO.class);
+        dto.setServiceMatterName(categoryMap.get(dto.getServiceMatter()));
+        return dto;
     }
 
     @Override
@@ -287,4 +294,81 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
         return new Result().ok(str);
     }
 
+    /**
+     * 联建活动统计
+     *
+     * @param formDTO
+     * @Param formDTO
+     * @Return {@link List< OptionDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/9 14:55
+     */
+    @Override
+    public List<OptionDTO> statistics(PartyActivityFormDTO formDTO) {
+        List<OptionDTO> list = new ArrayList<>();
+        if (null == formDTO.getStartTime() && null == formDTO.getEndTime()) {
+            setDate(formDTO);
+        }
+        ActivityStatisticsDTO dto = baseDao.getStatistics(formDTO);
+
+        OptionDTO unit = new OptionDTO();
+        unit.setLabel("组织单位");
+        unit.setValue(dto.getUnitCount());
+        list.add(unit);
+        OptionDTO activity = new OptionDTO();
+        activity.setLabel("组织活动");
+        activity.setValue(dto.getActivityCount());
+        list.add(activity);
+
+        return list;
+    }
+
+    /**
+     * 联建活动统计列表
+     *
+     * @param formDTO
+     * @Param formDTO
+     * @Return {@link PageData< IcPartyActivityDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/9 16:24
+     */
+    @Override
+    public PageData<IcPartyActivityDTO> getActivityList(TokenDto tokenDto, PartyActivityFormDTO formDTO) {
+        if (null == formDTO.getStartTime() && null == formDTO.getEndTime()) {
+            setDate(formDTO);
+        }
+        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
+        LambdaQueryWrapper<IcPartyActivityEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcPartyActivityEntity::getAgencyId, formDTO.getAgencyId());
+        wrapper.eq(StringUtils.isNotBlank(formDTO.getServiceMatter()), IcPartyActivityEntity::getServiceMatter, formDTO.getServiceMatter());
+        wrapper.ge(null != formDTO.getStartTime(),IcPartyActivityEntity::getActivityTime, formDTO.getStartTime());
+        wrapper.le(null != formDTO.getEndTime(), IcPartyActivityEntity::getActivityTime, formDTO.getEndTime());
+        wrapper.orderByDesc(IcPartyActivityEntity::getActivityTime);
+        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));
+            SubCodeFormDTO codeFormDTO = new SubCodeFormDTO();
+            codeFormDTO.setCustomerId(tokenDto.getCustomerId());
+            codeFormDTO.setParentCategoryCode("1010");
+            Map<String, String> categoryMap = icResiDemandDictService.querySubCodeList(codeFormDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel));
+            dtoList.forEach(dto -> {
+                dto.setServiceMatterName(categoryMap.get(dto.getServiceMatter()));
+                dto.setUnitName(option.get(dto.getUnitId()));
+            });
+        }
+        PageInfo<IcPartyActivityDTO> pageInfo = new PageInfo<>(dtoList);
+        return new PageData<>(dtoList, pageInfo.getTotal());
+    }
+
+    private void setDate(PartyActivityFormDTO formDTO) {
+        String start = DateUtils.getBeforeNDay(30);
+        formDTO.setEndTime(DateUtils.parse(start.concat("000000"), DateUtils.DATE_TIME_NO_SPLIT));
+        String end = DateUtils.format(new Date(), DateUtils.DATE_PATTERN);
+        formDTO.setEndTime(DateUtils.parse(end.concat(" 23:59:59"), DateUtils.DATE_TIME_PATTERN));
+    }
+
 }
\ No newline at end of file
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 4931389ae0..336c60f7be 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
@@ -24,7 +24,10 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.dto.form.DictListFormDTO;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.dto.result.DictListResultDTO;
+import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
 import com.epmet.commons.tools.enums.DictTypeEnum;
 import com.epmet.commons.tools.enums.PartyUnitTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
@@ -37,9 +40,11 @@ import com.epmet.commons.tools.utils.ExcelPoiUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcPartyUnitDao;
 import com.epmet.dto.IcPartyUnitDTO;
+import com.epmet.dto.form.PartyActivityFormDTO;
 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.PartyUnitDistributionResultDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.IcPartyUnitEntity;
 import com.epmet.excel.IcPartyUnitImportExcel;
@@ -370,6 +375,49 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
         return new Result().ok(str);
     }
 
+    /**
+     * @param formDTO
+     * @Description 按类型统计单位数量
+     * @Param formDTO
+     * @Return {@link List<OptionDataResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/8 14:56
+     */
+    @Override
+    public List<OptionDataResultDTO> typeStatistics(PartyActivityFormDTO formDTO) {
+        DictListFormDTO dictFromDTO = new DictListFormDTO();
+        dictFromDTO.setDictType(DictTypeEnum.PARTY_UNIT_TYPE.getCode());
+        Result<List<DictListResultDTO>> dictResult = epmetAdminOpenFeignClient.dictList(dictFromDTO);
+        if (!dictResult.success()) {
+            throw new EpmetException(dictResult.getCode());
+        }
+
+        List<OptionDataResultDTO> list = baseDao.getTypeStatistics(formDTO.getAgencyId());
+        Map<String, String> map = list.stream().collect(Collectors.toMap(OptionDataResultDTO::getCode, OptionDataResultDTO::getValue));
+
+        return dictResult.getData().stream().map(item -> {
+            OptionDataResultDTO dto = new OptionDataResultDTO();
+            dto.setLabel(item.getLabel());
+            dto.setCode(item.getValue());
+            dto.setValue(null == map.get(item.getValue())?NumConstant.ZERO_STR:map.get(item.getValue()));
+            return dto;
+        }).collect(Collectors.toList());
+    }
+
+    /**
+     * 联建单位分布
+     *
+     * @param formDTO
+     * @Param formDTO
+     * @Return {@link List<PartyUnitDistributionResultDTO >}
+     * @Author zhaoqifeng
+     * @Date 2021/12/9 10:10
+     */
+    @Override
+    public List<PartyUnitDistributionResultDTO> distribution(PartyActivityFormDTO formDTO) {
+        return baseDao.getDistribution(formDTO.getAgencyId());
+    }
+
     private String getServiceMatter(Map<String, String> map, String matter) {
         List<String> matters = Arrays.asList(matter.split(StrConstant.COLON));
         List<String> list = matters.stream().map(map::get).collect(Collectors.toList());
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml
index fd84685f0e..ede5b4c0e1 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml
@@ -26,6 +26,24 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="getStatistics" resultType="com.epmet.dto.result.ActivityStatisticsDTO" parameterType="com.epmet.dto.form.PartyActivityFormDTO">
+        SELECT
+            count( ID ) AS "activityCount",
+            COUNT( DISTINCT UNIT_ID ) AS "unitCount"
+        FROM
+            ic_party_activity
+        WHERE DEL_FLAG = '0'
+        AND (AGENCY_ID = #{agencyId} OR PIDS LIKE concat( '%', #{agencyId}, '%' ))
+        <if test='null != serviceMatter'>
+           AND SERVICE_MATTER = #{serviceMatter}
+        </if>
+        <if test='null != startTime'>
+           AND ACTIVITY_TIME &gt;= #{startTime}
+        </if>
+        <if test='null != endTime'>
+           AND ACTIVITY_TIME &lt;= #{endTime}
+        </if>
+    </select>
 
 
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml
index a346765fd8..aa0785186d 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml
@@ -46,4 +46,32 @@
         </foreach>
     </select>
 
+    <select id="getTypeStatistics" resultType="com.epmet.commons.tools.dto.result.OptionDataResultDTO">
+        SELECT
+            TYPE AS "code",
+            COUNT( ID ) AS "value"
+        FROM
+            ic_party_unit
+        WHERE
+            DEL_FLAG = '0'
+            AND (AGENCY_ID = #{agencyId} OR PIDS LIKE concat( '%', #{agencyId}, '%' ))
+        GROUP BY
+            TYPE
+    </select>
+    <select id="getDistribution" resultType="com.epmet.dto.result.PartyUnitDistributionResultDTO">
+        SELECT
+            ID,
+            UNIT_NAME AS "name",
+            TYPE,
+            LONGITUDE,
+            LATITUDE
+        FROM
+            ic_party_unit
+        WHERE
+            DEL_FLAG = '0'
+            AND (AGENCY_ID = #{agencyId} OR PIDS LIKE concat( '%', #{agencyId}, '%' ))
+        ORDER BY
+            ID
+    </select>
+
 </mapper>
\ No newline at end of file