From 1521bfd1972436d5ac7a45a9d4c470832416d62c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Wed, 12 Feb 2020 18:41:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=97=B4=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/user/UserAnalysisDao.xml | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

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 2bb205484..232f47184 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
@@ -42,6 +42,10 @@
                         </otherwise>
                     </choose>
                     /*待补充按时间筛选*/
+                   <if test="startTime != null and endTime != null and endTime != ''">
+                    AND uu.CREATED_TIME BETWEEN #{startTime}
+                    AND #{endTime}
+                   </if>
                     AND ad.id IS NOT NULL
                 ) t
             GROUP BY t.streetId
@@ -69,6 +73,10 @@
                 and ad2.ID in
                 <foreach collection="streetIdList" item="deptId" open="(" separator="," close=")">#{deptId}</foreach>
             </if>
+            <if test="startTime != null and endTime != null and endTime != ''">
+                AND uu.CREATED_TIME BETWEEN #{startTime}
+                AND #{endTime}
+            </if>
         GROUP BY
             ad2.ID
     </select>
@@ -112,6 +120,10 @@
             <if test="gridIdList != null and gridIdList.size() > 0">
                 AND nn.DEPT_ID in <foreach item="item" collection="gridIdList" open="(" separator="," close=")"> #{item} </foreach>
             </if>
+            <if test="startTime != null and endTime != null and endTime != ''">
+                AND nn.CREATED_TIME BETWEEN #{startTime}
+                AND #{endTime}
+            </if>
         GROUP BY nn.DEPT_ID
     </select>
 
@@ -127,6 +139,10 @@
             <if test="gridIdList != null and gridIdList.size() > 0">
                 AND nn.DEPT_ID in <foreach item="item" collection="gridIdList" open="(" separator="," close=")"> #{item} </foreach>
             </if>
+            <if test="startTime != null and endTime != null and endTime != ''">
+                AND nn.CREATED_TIME BETWEEN #{startTime}
+                AND #{endTime}
+            </if>
         GROUP BY nn.DEPT_ID
     </select>
 
@@ -142,6 +158,10 @@
             <if test="gridIdList != null and gridIdList.size() > 0">
                 AND epen.GRID_ID in <foreach item="item" collection="gridIdList" open="(" separator="," close=")"> #{item} </foreach>
             </if>
+            <if test="startTime != null and endTime != null and endTime != ''">
+                AND epen.CREATED_TIME BETWEEN #{startTime}
+                AND #{endTime}
+            </if>
         GROUP BY epen.GRID_ID
     </select>
 
@@ -159,6 +179,10 @@
             <if test="gridIdList != null and gridIdList.size() > 0">
                 AND epen.GRID_ID in <foreach item="item" collection="gridIdList" open="(" separator="," close=")"> #{item} </foreach>
             </if>
+            <if test="startTime != null and endTime != null and endTime != ''">
+                AND epen.CREATED_TIME BETWEEN #{startTime}
+                AND #{endTime}
+            </if>
         GROUP BY epen.GRID_ID
     </select>
 
@@ -178,6 +202,10 @@
             <if test="gridIdList != null and gridIdList.size() > 0">
                 AND epgr.GRID_ID in <foreach item="item" collection="gridIdList" open="(" separator="," close=")"> #{item} </foreach>
             </if>
+            <if test="startTime != null and endTime != null and endTime != ''">
+                AND epgr.CREATED_TIME BETWEEN #{startTime}
+                AND #{endTime}
+            </if>
         GROUP BY epgr.GRID_ID
     </select>
 
@@ -332,6 +360,10 @@
                 <if test="gridIdList != null and gridIdList.size() > 0">
                     AND uu.DEPT_ID in <foreach item="item" collection="gridIdList" open="(" separator="," close=")"> #{item} </foreach>
                 </if>
+                <if test="startTime != null and endTime != null and endTime != ''">
+                    AND uu.CREATED_TIME BETWEEN #{startTime}
+                    AND #{endTime}
+                </if>
                 AND uu.DEPT_ID IS NOT NULL
             ) t
         GROUP BY t.DEPT_ID