From 76958714f12f7fce2857bd53a9134afee6b3f5cb Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 23 Sep 2021 10:04:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9pid=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dataaggre/dto/epmettduck/result/CascaderDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/CascaderDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/CascaderDTO.java index 82904a64e9..44e8edac6f 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/CascaderDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/CascaderDTO.java @@ -29,7 +29,7 @@ public class CascaderDTO implements Serializable { /** * pid */ - private String pid; + private Integer pid; /** * 全路径名字 From 3b57469604d5b192674ee3ac2adce0e6bb79f8bf Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 23 Sep 2021 10:09:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java | 8 -------- .../main/resources/mapper/epmettduck/PrUserProjectDao.xml | 4 ---- 2 files changed, 12 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java index 2c185e8db7..ed30a5246c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java @@ -65,14 +65,6 @@ public interface PrUserProjectDao extends BaseDao { */ List queryProjectList(@Param("keys")List keys, @Param("status")Integer status,@Param("client")String client); - /** - * @Description 查询头部信息【问卷调查的名字和描述】 - * @Param key - * @author zxc - * @date 2021/9/22 9:42 上午 - */ - PrUserProjectEntity selectHeaderInfoByKey(@Param("key")String key); - /** * 当前问卷中所有的联系人组件 * diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml index c3eba867a2..228419ebea 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml @@ -90,8 +90,4 @@ ORDER BY created_time DESC - - \ No newline at end of file From 32ad450ca5eebb91fa159e03c6d95e24f7db6995 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 23 Sep 2021 11:56:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=BA=A7=E4=B8=8B=E7=BA=A7=E7=BB=84=E7=BB=87=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/govorg/CustomerAgencyDao.java | 25 +++++++++++++++-- .../mapper/govorg/CustomerAgencyDao.xml | 27 +++++++++++++++++-- 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java index 673d317fe6..bd29030255 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java @@ -71,10 +71,31 @@ public interface CustomerAgencyDao extends BaseDao { * @return */ StaffOrgRelationResultDTO getStaffFromOrgType(@Param("staffId") String staffId); - + /** + * @Description 工作端组织级下级组织树 + * @Param agencyId + * @Return {@link OrgTreeResultDTO} + * @Author zhaoqifeng + * @Date 2021/9/23 10:16 + */ OrgTreeResultDTO getOrgTree(@Param("agencyId") String agencyId); List getSubOrgList(@Param("pid") String pid); - + /** + * @Description 居民端组织级下级组织树 + * @Param agencyId + * @Return {@link OrgTreeResultDTO} + * @Author zhaoqifeng + * @Date 2021/9/23 10:16 + */ OrgTreeResultDTO getResiOrgTree(@Param("agencyId") String agencyId); List getResiSubOrgList(@Param("pid") String pid); + + /** + * @Description 工作人员所在的组织，部门，网格 + * @Param staffId + * @Return {@link List< String>} + * @Author zhaoqifeng + * @Date 2021/9/23 10:16 + */ + List getOrgList(@Param("staffId") String staffId); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml index d47b736984..aa345e87b3 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml @@ -201,7 +201,7 @@ select ID AS orgId, ORGANIZATION_NAME AS orgName, - 'agency' AS orgName, + 'agency' AS orgType, CONCAT(PIDS,ID) AS orgPids from @@ -253,7 +253,7 @@ select ID AS orgId, ORGANIZATION_NAME AS orgName, - 'agency' AS orgName, + 'agency' AS orgType, CONCAT(PIDS,ID) AS orgPids from @@ -262,5 +262,28 @@ DEL_FLAG = 0 AND ID = #{agencyId} +