From 4cfb8ddbaf88fe5133a1384d075e03a73c8f71e9 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 9 Mar 2022 14:23:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E9=98=B4=E7=9A=84=E4=B8=89=E4=B8=AA?=
 =?UTF-8?q?=E8=A1=97=E9=81=93=E7=9A=84=E6=95=B0=E6=8D=AE=E5=9C=A8=E8=A1=A8?=
 =?UTF-8?q?=E9=87=8C=E5=90=8C=E4=B8=80=E5=A4=A9=E4=BC=9A=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E4=B8=A4=E6=9D=A1=EF=BC=8C=E4=B8=80=E6=9D=A1=E6=98=AF=E4=B8=8A?=
 =?UTF-8?q?=E6=8A=A5=E7=9A=84=E4=B8=80=E6=9D=A1=E6=98=AF=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E7=BB=9F=E8=AE=A1=E7=9A=84=EF=BC=8C=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=B6=E5=88=86=E5=88=AB=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=BD=91=E6=A0=BC=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/datastats/DatsStatsDao.xml  | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

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 26f74c4124..891e6f2cf4 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
@@ -1033,7 +1033,13 @@
                 <if test='endTime != "" and endTime != null '>
                     AND date_id <![CDATA[<=]]> #{endTime}
                 </if>
-                GROUP BY date_id, agency_id
+                <!-- 平阴的三个街道的数据在表里同一天会存在两条，一条是上报的一条是小程序统计的，所以查询时需要sum,此处就得分组 -->
+                <if test='dataType == "agency"'>
+                    GROUP BY date_id, agency_id
+                </if>
+                <if test='dataType == "grid"'>
+                    GROUP BY date_id, grid_id
+                </if>
                 ORDER BY date_id ASC
             </if>
             <if test='sourceType != "" and sourceType == "end" and endTime != "" and endTime != null '>
@@ -1041,7 +1047,13 @@
                     AND date_id <![CDATA[>=]]> #{startTime}
                 </if>
                 AND date_id <![CDATA[<=]]> #{endTime}
-                GROUP BY date_id, agency_id
+                <!-- 平阴的三个街道的数据在表里同一天会存在两条，一条是上报的一条是小程序统计的，所以查询时需要sum,此处就得分组 -->
+                <if test='dataType == "agency"'>
+                    GROUP BY date_id, agency_id
+                </if>
+                <if test='dataType == "grid"'>
+                    GROUP BY date_id, grid_id
+                </if>
                 ORDER BY date_id DESC
             </if>
             <choose>