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

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java

@@ -135,8 +135,6 @@ public interface GovOrgCoverageService {
      */
     IcCoverageCategoryDictEntity selectByCategoryKey(String categoryKey);
 
-    List<IcCoverageCategoryDictEntity> listCoverageCategoryEntities(String coverageType);
-
     /**
      * Desc: 根据客户ID和数据类型获取字典对应的url
      * @param customerId

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java

@@ -100,6 +100,22 @@ public class CommunitySelfOrganizationListDTO implements Serializable {
      * 积分
      */
     private Integer score;
+
+    /**
+     * 同步状态【已同步:sync  未同步:not_sync】
+     */
+    private String syncType;
+
+    /**
+     * 部门ID customer_department.id
+     */
+    private String deptId;
+
+    /**
+     * 部门下工作人员Id
+     */
+    private String deptStaffId;
+
     /**
      * 社区自组织人员
      */

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml

@@ -63,7 +63,10 @@
             so.LATITUDE AS latitude,
             so.ADDRESS as address,
             so.ID as orgId,
-            so.remark
+            so.remark,
+            so.sync_type AS syncType,
+            so.dept_id AS deptId,
+            so.dept_staff_id AS deptStaffId
         FROM ic_community_self_organization so
         WHERE so.DEL_FLAG = 0
             <if test="null != agencyId and agencyId != '' ">