From ad15141a41ca6b676047724c4a3350834ed4abf5 Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Wed, 12 Feb 2020 15:46:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=BC=80=E9=80=9A=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=EF=BC=8C=E5=88=97=E8=A1=A8=E5=88=86=E9=A1=B5=EF=BC=8C?=
 =?UTF-8?q?=E6=8C=89=E9=83=A8=E9=97=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/user/dao/UserAnalysisDao.java     | 18 ------
 .../resources/mapper/user/UserAnalysisDao.xml | 60 ++-----------------
 2 files changed, 4 insertions(+), 74 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java
index 34dae6c4e..483d82f97 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java
@@ -24,24 +24,6 @@ import java.util.Map;
 @Mapper
 public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
 
-    /***
-     * 居民注册
-     * @param
-     * @return java.util.List<com.elink.esua.epdc.dto.user.UserAnalysisDTO>
-     * @author qushutong
-     * @date 2020/2/11 12:32
-     */
-    List<GridOpeningResultDTO> selectListReigistCount();
-
-    /***
-     * 党员数
-     * @param
-     * @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
-     * @author qushutong
-     * @date 2020/2/11 14:10
-     */
-    List<GridOpeningResultDTO> selectListPartyCount();
-
     /***
      * 居民扫码数
      * @param
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
index d21e8e057..c10aff188 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
@@ -2,32 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.elink.esua.epdc.modules.user.dao.UserAnalysisDao">
-    <select id="selectListReigistCount" resultType="com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO">
-        SELECT
-	        CONCAT(ad2.`name`,ad1.`name`,t0.`name`) AS allDeptName,
-            count(uu.ID) AS registerCount
-        FROM
-            (
-                SELECT
-                    ad.id,
-                    ad.`name`,
-                    ad.pid
-                FROM
-                    esua_epdc_admin.sys_dept ad
-                WHERE
-                    ad.type_key = 'grid_party'
-                AND ad.del_flag = 0
-            ) t0
-        LEFT JOIN esua_epdc_user.epdc_user uu ON uu.DEPT_ID = t0.id
-        AND uu.DEL_FLAG = '0'
-        LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad1.id = t0.pid
-        LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid
-        GROUP BY
-            t0.id
-        ORDER BY
-            t0.id ASC
-    </select>
-
 
     <select id="selectListUserDataRank" resultType="com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO">
         SELECT
@@ -95,32 +69,6 @@
             ad2.ID
     </select>
 
-    <!--党员数-->
-    <select id="selectListPartyCount" resultType="com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO">
-        SELECT
-            CONCAT(ad2.`name`,ad1.`name`,t0.`name`) AS allDeptName,
-            count(up.ID) AS partyCount
-        FROM
-            (
-                SELECT
-                    ad.id,
-                    ad.`name`,
-                    ad.pid
-                FROM
-                    esua_epdc_admin.sys_dept ad
-                WHERE
-                    ad.type_key = 'grid_party'
-                AND ad.del_flag = 0
-            ) t0
-        LEFT JOIN esua_epdc_user.epdc_party_members up ON up.GRID_ID = t0.id
-        AND up.DEL_FLAG = '0'
-        LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad1.id = t0.pid
-        LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid
-        GROUP BY
-            t0.id
-        ORDER BY
-            t0.id ASC
-    </select>
 
     <!--居民扫码数-->
     <select id="selectListEwmCount" resultType="com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO">
@@ -199,7 +147,7 @@
         SELECT
             epen.GRID_ID gridId,
             COUNT( epen.ID ) itemCount,
-            count(epen.EVENT_STATE = '10' or null) itemCloseCount
+            count(epen.ITEM_STATE = '10' or null) itemCloseCount
         FROM
             esua_epdc_events.epdc_item epen
         WHERE
@@ -324,18 +272,18 @@
             GROUP_CONCAT( DISTINCT u.real_name ) gridLeader
         FROM
             esua_epdc_admin.sys_dept ad
-            LEFT JOIN esua_epdc_admin.epdc_dept_ma_code ama ON ad.id = ama.GRID_ID
-            AND ama.DEL_FLAG = '0'
+            LEFT JOIN esua_epdc_admin.epdc_dept_ma_code ama ON ad.id = ama.GRID_ID AND ama.DEL_FLAG = '0'
             LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad1.id = ad.pid
             LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid
             LEFT JOIN esua_epdc_admin.sys_role_data_scope ards ON ards.dept_id = ad.id
-            LEFT JOIN esua_epdc_admin.sys_role r ON ards.role_id = r.id AND r.DEL_FLAG = 0
+            LEFT JOIN esua_epdc_admin.sys_role r ON ards.role_id = r.id AND r.DEL_FLAG = 0 and r.type_key = 'gridLeader'
             LEFT JOIN esua_epdc_admin.sys_role_user ru ON r.id = ru.role_id
             LEFT JOIN esua_epdc_admin.sys_user u ON ru.user_id = u.id AND u.del_flag = 0
         WHERE
             ad.type_key = 'grid_party'
             AND ad.del_flag = 0
             AND ama.ID IS NOT NULL
+            <if test="gridId != null and grid != ''">and (ad1.id = #{gridId} or ad2.id = #{gridId})</if>
         GROUP BY
             ad.id
         ORDER BY