From 9c71c9779828309fb29a007905084bea77176f5c Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 28 Jul 2022 16:16:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E8=87=AA=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E3=80=81=E8=81=94=E5=BB=BA=E5=8D=95=E4=BD=8D=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/CommunitySelfOrganizationListDTO.java | 16 ++++++++++++++++ .../mapper/IcCommunitySelfOrganizationDao.xml | 5 ++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java index 39552f7654..790c8c2a44 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java @@ -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; + /** * 社区自组织人员 */ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml index 872caf9999..1ab8c2264b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml @@ -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 From 36a89abc4a4ea5e853e803751dc6659d79156556 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 28 Jul 2022 16:27:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=BC=8F=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dataaggre/service/govorg/GovOrgCoverageService.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java index b13cd75b74..26faa47e81 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java +++ b/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 listCoverageCategoryEntities(String coverageType); - /** * Desc: 根据客户ID和数据类型获取字典对应的url * @param customerId