From dbf5cc29243ac3a246916c59181a9e7a6f803b26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Wed, 12 Feb 2020 15:16:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E6=9E=90=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/user/dao/UserAnalysisDao.java     |  4 +--
 .../service/impl/UserAnalysisServiceImpl.java |  4 +--
 .../resources/mapper/user/UserAnalysisDao.xml | 29 ++++++++++++++++---
 3 files changed, 29 insertions(+), 8 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 0be55f270..81e78f181 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
@@ -157,7 +157,7 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
      * @param [formDTO]
      * @return com.elink.esua.epdc.dto.user.result.UserAnalysisCountDTO
      */
-    UserAnalysisCountDTO getUserStatistics(UserCountDTO formDto);
+    UserAnalysisCountDTO getUserStatistics(UserCountDTO formDto, List<Long> deptIdList);
 
 
     /**
@@ -168,7 +168,7 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
      * @param [formDTO]
      * @return com.elink.esua.epdc.dto.user.result.GriddingCountDTO
      */
-    GriddingCountDTO getGridStatistics(UserCountDTO formDto);
+    GriddingCountDTO getGridStatistics(UserCountDTO formDto, List<Long> deptIdList);
 
     /**
      * @Description  注册用户数排名
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java
index dfba5a3a7..c84df86c9 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java
@@ -139,7 +139,7 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
      */
     @Override
     public Result getUserStatistics(UserCountDTO formDto) {
-        UserAnalysisCountDTO message = baseDao.getUserStatistics(formDto);
+        UserAnalysisCountDTO message = baseDao.getUserStatistics(formDto,SecurityUser.getUser().getDeptIdList());
         return new Result<UserAnalysisCountDTO>().ok(message);
     }
 
@@ -154,7 +154,7 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
      */
     @Override
     public Result getGridStatistics(UserCountDTO formDto) {
-        GriddingCountDTO message = baseDao.getGridStatistics(formDto);
+        GriddingCountDTO message = baseDao.getGridStatistics(formDto,SecurityUser.getUser().getDeptIdList());
         return new Result<GriddingCountDTO>().ok(message);
     }
 
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 ae45ad3c2..22a4f7b25 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
@@ -428,9 +428,23 @@
             COUNT( u.party_flag = '1' OR NULL ) partyMemberCount
         FROM
             esua_epdc_user.epdc_user u
+        LEFT JOIN esua_epdc_admin.sys_dept ad ON u.DEPT_ID = ad.ID
+        AND ad.type_key = 'grid_party'
+        LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad.pid = ad1.id
+        LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad1.pid = ad2.id
         WHERE
         u.DEL_FLAG = '0'
-        AND u.DEPT_ID = #{deptId}
+        AND ad.id IS NOT NULL
+        <if test="deptIdList != null and deptIdList.size() > 0">
+            and ad2.ID  in
+            <foreach item="deptIdItem" collection="deptIdList" open="(" separator="," close=")">
+                #{deptIdItem}
+            </foreach>
+        </if>
+        <if test='formDto.deptId != null and formDto.deptId != ""'>
+            AND ad2.id = #{formDto.deptId}
+        </if>
+
         )t
     </select>
     <select id="getGridStatistics" resultType="com.elink.esua.epdc.dto.user.result.GriddingCountDTO" parameterType="com.elink.esua.epdc.dto.user.form.UserCountDTO">
@@ -445,9 +459,16 @@
             LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad1.pid = ad2.id
         WHERE
             ad.type_key = 'grid_party'
-            AND ad2.id != 1191534129122230274
-            AND ad2.id != 1201319745506598913
-            AND ad2.id = #{deptId}
+        <if test="deptIdList != null and deptIdList.size() > 0">
+            and ad2.ID  in
+            <foreach item="deptIdItem" collection="deptIdList" open="(" separator="," close=")">
+                #{deptIdItem}
+            </foreach>
+        </if>
+
+        <if test='formDto.deptId != null and formDto.deptId != ""'>
+            AND ad2.id = #{formDto.deptId}
+        </if>
         ORDER BY
             ad.create_date ASC
     </select>