From c90549d002caac6b34b688e2e4f94024efce52ff Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 3 Dec 2021 10:32:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E6=95=B0=E6=8D=AE=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2bug=E4=BF=AE=E5=A4=8D=E3=80=90=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E8=B4=9F=E6=95=B0=E9=97=AE=E9=A2=98=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/datastats/DatsStatsDao.xml         | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index 4f101da15f..3332f525f3 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -831,9 +831,15 @@
             </choose>
             <if test='sourceType != "" and sourceType == "start" and startTime != "" and startTime != null '>
                 AND date_id <![CDATA[>=]]> #{startTime}
+                <if test='endTime != "" and endTime != null '>
+                    AND date_id <![CDATA[<=]]> #{endTime}
+                </if>
                 ORDER BY date_id ASC
             </if>
             <if test='sourceType != "" and sourceType == "end" and endTime != "" and endTime != null '>
+                <if test='startTime != "" and startTime != null '>
+                    AND date_id <![CDATA[>=]]> #{startTime}
+                </if>
                 AND date_id <![CDATA[<=]]> #{endTime}
                 ORDER BY date_id DESC
             </if>
@@ -871,9 +877,15 @@
             </choose>
             <if test='sourceType != "" and sourceType == "start" and startTime != "" and startTime != null '>
                 AND date_id <![CDATA[>=]]> #{startTime}
+                <if test='endTime != "" and endTime != null '>
+                    AND date_id <![CDATA[<=]]> #{endTime}
+                </if>
                 ORDER BY date_id ASC
             </if>
             <if test='sourceType != "" and sourceType == "end" and endTime != "" and endTime != null '>
+                <if test='startTime != "" and startTime != null '>
+                    AND date_id <![CDATA[>=]]> #{startTime}
+                </if>
                 AND date_id <![CDATA[<=]]> #{endTime}
                 ORDER BY date_id DESC
             </if>
@@ -911,9 +923,15 @@
             </choose>
             <if test='sourceType != "" and sourceType == "start" and startTime != "" and startTime != null '>
                 AND date_id <![CDATA[>=]]> #{startTime}
+                <if test='endTime != "" and endTime != null '>
+                    AND date_id <![CDATA[<=]]> #{endTime}
+                </if>
                 ORDER BY date_id ASC
             </if>
             <if test='sourceType != "" and sourceType == "end" and endTime != "" and endTime != null '>
+                <if test='startTime != "" and startTime != null '>
+                    AND date_id <![CDATA[>=]]> #{startTime}
+                </if>
                 AND date_id <![CDATA[<=]]> #{endTime}
                 ORDER BY date_id DESC
             </if>
@@ -951,9 +969,15 @@
             </choose>
             <if test='sourceType != "" and sourceType == "start" and startTime != "" and startTime != null '>
                 AND date_id <![CDATA[>=]]> #{startTime}
+                <if test='endTime != "" and endTime != null '>
+                    AND date_id <![CDATA[<=]]> #{endTime}
+                </if>
                 ORDER BY date_id ASC
             </if>
             <if test='sourceType != "" and sourceType == "end" and endTime != "" and endTime != null '>
+                <if test='startTime != "" and startTime != null '>
+                    AND date_id <![CDATA[>=]]> #{startTime}
+                </if>
                 AND date_id <![CDATA[<=]]> #{endTime}
                 ORDER BY date_id DESC
             </if>
@@ -991,9 +1015,15 @@
             </choose>
             <if test='sourceType != "" and sourceType == "start" and startTime != "" and startTime != null '>
                 AND date_id <![CDATA[>=]]> #{startTime}
+                <if test='endTime != "" and endTime != null '>
+                    AND date_id <![CDATA[<=]]> #{endTime}
+                </if>
                 ORDER BY date_id ASC
             </if>
             <if test='sourceType != "" and sourceType == "end" and endTime != "" and endTime != null '>
+                <if test='startTime != "" and startTime != null '>
+                    AND date_id <![CDATA[>=]]> #{startTime}
+                </if>
                 AND date_id <![CDATA[<=]]> #{endTime}
                 ORDER BY date_id DESC
             </if>