From fb8b5af36287fb2333f08b68698f28a5351aa968 Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Thu, 6 Jan 2022 09:11:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=201.=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=E5=91=98=E5=B7=A5=E4=BD=9C=E7=BB=9F=E8=AE=A1=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E4=B8=BA=E5=8C=85=E5=90=ABendTime=EF=BC=9B=E6=94=BE?=
 =?UTF-8?q?=E5=BC=83=E4=BD=BF=E7=94=A8=E5=85=A8=E9=87=8F=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=E6=94=B9=E7=94=A8sum(=E5=A2=9E?=
 =?UTF-8?q?=E9=87=8F)=E6=96=B9=E5=BC=8F=E7=BB=9F=E8=AE=A1=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A5=E9=98=B2=E6=AD=A2=E6=BC=8F=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datastats/impl/DataStatsServiceImpl.java  | 28 ++++++++++---------
 .../FactGridMemberStatisticsDailyDao.xml      |  9 ++++--
 .../StatsStaffPatrolRecordDailyDao.xml        |  2 +-
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 224f55f61c..5055a01925 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -2158,18 +2158,20 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve
                                                                                        String endDateID,
                                                                                        Boolean needCount) {
 
-        boolean isStartDateIdBlank = StringUtils.isBlank(startDateID);
-        boolean isEndDateIdBlank = StringUtils.isBlank(endDateID);
-
-        if (isStartDateIdBlank && !isEndDateIdBlank) {
-            // 查询截止时间的累计值，直接查询表里的total即可
-            PageHelper.startPage(pageNo, pageSize, needCount);
-            return factGridMemberStatisticsDailyDao.listGridMemberDataStatsAccumulate(pids, gridId, endDateID);
-        } else if (!isStartDateIdBlank && !isEndDateIdBlank) {
-            // 查询时间段内的增量，需要使用表中的增量列计算
-            return factGridMemberStatisticsDailyDao.listGridMemberDataStatsIncr(pids, gridId, startDateID,  endDateID);
-        } else {
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "【pcwork查询网格员数据统计列表】传入时间条件有误");
-        }
+        //boolean isStartDateIdBlank = StringUtils.isBlank(startDateID);
+        //boolean isEndDateIdBlank = StringUtils.isBlank(endDateID);
+        //
+        //if (isStartDateIdBlank && !isEndDateIdBlank) {
+        //    // 查询截止时间的累计值，直接查询表里的total即可
+        //    PageHelper.startPage(pageNo, pageSize, needCount);
+        //    return factGridMemberStatisticsDailyDao.listGridMemberDataStatsAccumulate(pids, gridId, endDateID);
+        //} else if (!isStartDateIdBlank && !isEndDateIdBlank) {
+        //    // 查询时间段内的增量，需要使用表中的增量列计算
+        //    return factGridMemberStatisticsDailyDao.listGridMemberDataStatsIncr(pids, gridId, startDateID,  endDateID);
+        //} else {
+        //    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "【pcwork查询网格员数据统计列表】传入时间条件有误");
+        //}
+
+        return factGridMemberStatisticsDailyDao.listGridMemberDataStatsIncr(pids, gridId, startDateID,  endDateID);
     }
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/FactGridMemberStatisticsDailyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/FactGridMemberStatisticsDailyDao.xml
index 4a5c0e7578..4d3426a048 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/FactGridMemberStatisticsDailyDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/FactGridMemberStatisticsDailyDao.xml
@@ -185,9 +185,12 @@
             <if test="gridId != null and gridId != ''">
                 AND member.GRID_ID = #{gridId}
             </if>
-
-            and member.DATE_ID >= #{startDateID}
-            and member.DATE_ID <![CDATA[<]]> #{endDateID}
+            <if test="startDateID != null and startDateID!=''">
+                and member.DATE_ID >= #{startDateID}
+            </if>
+            <if test="endDateID != null and endDateID != ''">
+                and member.DATE_ID <![CDATA[<=]]> #{endDateID}
+            </if>
         group by member.grid_id,
             member.staff_id,
             member.STAFF_NAME
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml
index d95a39d0a4..2d0845dbf0 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml
@@ -80,7 +80,7 @@
             <if test="startDateId != null and startDateId != ''">
                 and sprd.DATE_ID >= #{startDateId}
             </if>
-            and sprd.DATE_ID <![CDATA[<]]> #{endDateID}
+            and sprd.DATE_ID <![CDATA[<=]]> #{endDateID}
         group by
             sprd.STAFF_ID,
             sprd.GRID_ID