From 431ee8211e7989e02b7f772d9c0aa8c401eeb95e Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Mon, 24 Aug 2020 14:48:57 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=BF=90=E8=90=A5=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E3=80=91-=E3=80=90=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=95=B0=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/8/24?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/user/UserAnalysisDao.xml    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 b45c65b2e..3655e530e 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
@@ -1350,10 +1350,10 @@
                               AND DATE_FORMAT(ecu.REACH_ACTIVE_TIME,'%Y-%m-%d') &lt;= #{endTime}
 
                           </if>
-                 		  <if test="operationStartTime != null and operationStartTime != '' and operationEndTime != null and operationEndTime != ''">
-                              and (#{operationStartTime} BETWEEN DATE_FORMAT(ecu.REACH_ACTIVE_TIME,'%Y-%m-%d') and  DATE_FORMAT(ecu.VALID_TIME,'%Y-%m-%d')
-                                     or
-                                    #{operationEndTime} BETWEEN DATE_FORMAT(ecu.REACH_ACTIVE_TIME,'%Y-%m-%d') and DATE_FORMAT(ecu.VALID_TIME,'%Y-%m-%d'))
+                          <if test="operationStartTime != null and operationStartTime != '' and operationEndTime != null and operationEndTime != ''">
+                              and (DATE_FORMAT(ecu.REACH_ACTIVE_TIME,'%Y-%m-%d') BETWEEN #{operationStartTime} and  #{operationEndTime}
+                                  or
+                                  DATE_FORMAT(ecu.VALID_TIME,'%Y-%m-%d') BETWEEN #{operationStartTime} and #{operationEndTime})
                           </if>
                 group by ecu.USER_ID -- 去重
                 )total