From f7902cbe0d72a180681990b0f575fa8cdad6e264 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Fri, 22 May 2020 21:10:35 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90pc=E7=AB=AF=20=E6=96=B0=E9=97=BB?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=95=B0,=E7=A4=BE=E7=BE=A4=E4=B9=A6,?=
 =?UTF-8?q?=E7=A4=BE=E7=BE=A4=E8=AF=9D=E9=A2=98=E6=95=B0=E3=80=91-?=
 =?UTF-8?q?=E3=80=90=E6=95=B0=E6=8D=AE=E6=A0=A1=E9=AA=8Csql=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E3=80=91-=EF=BC=88=E9=AD=8F=E5=87=AF=EF=BC=89-2020/05?=
 =?UTF-8?q?/22?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/user/form/ExportOperationFormDTO.java |  3 +
 .../service/impl/UserAnalysisServiceImpl.java |  8 +++
 .../resources/mapper/user/UserAnalysisDao.xml | 57 ++++++++++++++++---
 3 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/ExportOperationFormDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/ExportOperationFormDTO.java
index b4fb1ec0f..965f4d726 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/ExportOperationFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/ExportOperationFormDTO.java
@@ -21,4 +21,7 @@ public class ExportOperationFormDTO implements Serializable {
     private List<Long> allStreetIds;
 
     private String endTime;
+
+    private List<Long> deptIdList;
+
 }
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 ee9d26ec4..a6c4eff17 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
@@ -311,6 +311,14 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
             allStreetIds.add(item[0]);
         }
         exportOperationFormDTO.setAllStreetIds(allStreetIds);
+
+        //获取数据权限
+        UserDetail userDetail = SecurityUser.getUser();
+        if (null == userDetail.getDeptIdList() || userDetail.getDeptIdList().size() == 0) {
+            exportOperationFormDTO.setDeptIdList(null);
+        }else {
+            exportOperationFormDTO.setDeptIdList(userDetail.getDeptIdList());
+        }
         //用户相关
         List<ExportOperationDataResultDTO> exportOperationDataResultDTOS = baseDao.selectExportUserCount(exportOperationFormDTO);
         // 未认证用户
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 7f2967910..da25a7447 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
@@ -614,6 +614,14 @@
         <if test="endTime != null and endTime != ''">
             and DATE_FORMAT(un.CREATED_TIME,'%Y-%m-%d') &lt;=#{endTime}
         </if>
+        where
+        1=1
+        <if test="deptIdList != null and deptIdList.size() > 0">
+            AND un.DEPT_ID in
+            <foreach collection="deptIdList" open="(" separator="," close=")" item="deptId">
+                #{deptId}
+            </foreach>
+        </if>
         GROUP BY
             t0.id
         ORDER BY
@@ -641,10 +649,10 @@
                     where sd.del_flag='0')epen ON find_in_set(t0.id, epen.ALL_DEPT_IDS)
         AND epen.DEL_FLAG = '0'
         <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
-            AND epen.CREATED_TIME BETWEEN #{operationStartTime} AND #{operationEndTime}
+            AND DATE_FORMAT(epen.CREATED_TIME,'%Y-%m-%d') BETWEEN #{operationStartTime} AND #{operationEndTime}
         </if>
         <if test="endTime != null and endTime != ''">
-            and epen.CREATED_TIME &lt;=#{endTime}
+            and DATE_FORMAT(epen.CREATED_TIME,'%Y-%m-%d') &lt;=#{endTime}
         </if>
         GROUP BY
             t0.id
@@ -706,10 +714,27 @@
             OR epgr.STATE = '15'
         )
         <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
-            AND epgr.CREATED_TIME BETWEEN #{operationStartTime} AND #{operationEndTime}
+            AND DATE_FORMAT(epgr.CREATED_TIME,'%Y-%m-%d') BETWEEN #{operationStartTime} AND #{operationEndTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and DATE_FORMAT(epgr.CREATED_TIME,'%Y-%m-%d') &lt;=#{endTime}
+        </if>
+        LEFT JOIN esua_epdc_group.epdc_user_group ugp ON ugp.GROUP_ID = epgr.ID
+        AND ugp.DEL_FLAG = '0'
+        AND ugp.LORD_FLAG = '1'
+        <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
+            AND DATE_FORMAT(ugp.CREATED_TIME,'%Y-%m-%d') BETWEEN #{operationStartTime} AND #{operationEndTime}
         </if>
         <if test="endTime != null and endTime != ''">
-            and epgr.CREATED_TIME &lt;=#{endTime}
+            and DATE_FORMAT(ugp.CREATED_TIME,'%Y-%m-%d') &lt;=#{endTime}
+        </if>
+        where
+        1=1
+        <if test="deptIdList != null and deptIdList.size() > 0">
+            AND epgr.GRID_ID in
+            <foreach collection="deptIdList" open="(" separator="," close=")" item="deptId">
+                #{deptId}
+            </foreach>
         </if>
         GROUP BY
             t0.id
@@ -759,6 +784,14 @@
         <if test="endTime != null and endTime != ''">
             and DATE_FORMAT(ug.CREATED_TIME,'%Y-%m-%d') &lt;=#{endTime}
         </if>
+        where
+        1=1
+        <if test="deptIdList != null and deptIdList.size() > 0">
+            AND epgr.GRID_ID in
+            <foreach collection="deptIdList" open="(" separator="," close=")" item="deptId">
+                #{deptId}
+            </foreach>
+        </if>
         GROUP BY
         epgr.GRID_ID,
         t0.id
@@ -791,20 +824,28 @@
         AND (
         epgr.STATE = '10'
         <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
-            AND epgr.CREATED_TIME BETWEEN #{operationStartTime} AND #{operationEndTime}
+            AND DATE_FORMAT(epgr.CREATED_TIME,'%Y-%m-%d') BETWEEN #{operationStartTime} AND #{operationEndTime}
         </if>
         <if test="endTime != null and endTime != ''">
-            and epgr.CREATED_TIME &lt;=#{endTime}
+            and DATE_FORMAT(epgr.CREATED_TIME,'%Y-%m-%d') &lt;=#{endTime}
         </if>
         OR epgr.STATE = '15'
         )
         LEFT JOIN esua_epdc_group.epdc_topic ug ON epgr.id = ug.group_id
         AND ug.DEL_FLAG = '0'
         <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
-            AND ug.CREATED_TIME BETWEEN #{operationStartTime} AND #{operationEndTime}
+            AND DATE_FORMAT(ug.CREATED_TIME,'%Y-%m-%d') BETWEEN #{operationStartTime} AND #{operationEndTime}
         </if>
         <if test="endTime != null and endTime != ''">
-            and ug.CREATED_TIME &lt;=#{endTime}
+            and DATE_FORMAT(ug.CREATED_TIME,'%Y-%m-%d') &lt;=#{endTime}
+        </if>
+        where
+        1=1
+        <if test="deptIdList != null and deptIdList.size() > 0">
+            AND epgr.GRID_ID in
+            <foreach collection="deptIdList" open="(" separator="," close=")" item="deptId">
+                #{deptId}
+            </foreach>
         </if>
         GROUP BY
         t0.id