Merge branch 'dev_analysis' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_analysis

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java

@@ -110,7 +110,7 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
      * @author wangtong
      * @date 2020/2/11 14:55
      */
-    UserAnalysisCountDTO getUserStatistics(UserCountDTO formDto);
+    UserAnalysisCountDTO getUserStatistics(UserCountDTO formDto, List<Long> deptIdList);
 
 
     /**
@@ -121,7 +121,7 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
      * @author wangtong
      * @date 2020/2/11 14:55
      */
-    GriddingCountDTO getGridStatistics(UserCountDTO formDto);
+    GriddingCountDTO getGridStatistics(UserCountDTO formDto, List<Long> deptIdList);
 
     /**
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.user.result.UserSortRankResultDTO>>

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java

@@ -161,7 +161,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);
     }
 
@@ -176,7 +176,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);
     }
 

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml

@@ -191,9 +191,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">
@@ -208,7 +222,16 @@
             LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad1.pid = ad2.id
         WHERE
             ad.type_key = 'grid_party'
-            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>