Merge branch 'dev_question_naire' into develop

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;
 
     /**
      * 全路径名字

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<PrUserProjectEntity> {
      */
     List<TDuckListResultDTO> queryProjectList(@Param("keys")List<String> 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);
-
     /**
      * 当前问卷中所有的联系人组件
      *

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<CustomerAgencyEntity> {
      * @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<OrgTreeResultDTO> 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<OrgTreeResultDTO> getResiSubOrgList(@Param("pid") String pid);
+
+    /**
+     * @Description 工作人员所在的组织，部门，网格
+     * @Param staffId
+     * @Return {@link List< String>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/23 10:16
+     */
+    List<String> getOrgList(@Param("staffId") String staffId);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml

@@ -90,8 +90,4 @@
         ORDER BY created_time DESC
     </select>
 
-    <!-- 查询头部信息【问卷调查的名字和描述】 -->
-    <select id="selectHeaderInfoByKey" resultType="com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity">
-        select * from pr_user_project where del_flag = 0 and `key` = #{key}
-    </select>
 </mapper>

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}
     </select>
+    <select id="getOrgList" resultType="java.lang.String">
+        SELECT
+            AGENCY_ID AS orgId
+        FROM
+            customer_staff_agency
+        WHERE
+            DEL_FLAG = '0'
+            AND USER_ID = #{staffId} UNION
+        SELECT
+            GRID_ID AS orgId
+        FROM
+            customer_staff_grid
+        WHERE
+            DEL_FLAG = '0'
+            AND USER_ID = #{staffId} UNION
+        SELECT
+            DEPARTMENT_ID AS orgId
+        FROM
+            customer_staff_department
+        WHERE
+            DEL_FLAG = '0'
+            AND USER_ID = #{staffId}
+    </select>
 
 </mapper>