From 574881f87abc79f9f3f4ea85eaf6bbf3aecd8433 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Tue, 12 Mar 2024 14:45:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xydl/cac/service/impl/DataServiceImpl.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java
index 3de3ea8..c9a531d 100644
--- a/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java
@@ -100,6 +100,7 @@ public class DataServiceImpl implements DataService {
                 if (dayPerPage < 1) {
                     dayPerPage = 1;
                 }
+                ConditionModel newmodel = new ConditionModel();
 
                 // 处理开始和结束时间
                 Date end = model.getEndTime();
@@ -108,22 +109,23 @@ public class DataServiceImpl implements DataService {
                 }
                 end = DateUtil.addDay(end, 1);
                 end = DateUtil.getDayZero(end);
-                model.setEndTime(end);
                 if (model.getStartTime() != null) {
-                    totalDays = DateUtil.getDifferenceInDays(model.getStartTime(), model.getEndTime());
+                    totalDays = DateUtil.getDifferenceInDays(model.getStartTime(), end);
                 }
 
                 if (model.getPageNum() > 1) {
                     int p = model.getPageNum() - 1;
                     end = DateUtil.addDay(end, -dayPerPage * p);
                 }
-                model.setEndTime(end);
+                newmodel.setEndTime(end);
                 Date start = DateUtil.addDay(end, -dayPerPage);
                 if (model.getStartTime() == null || start.compareTo(model.getStartTime()) > 0) {
-                    model.setStartTime(start);
+                    newmodel.setStartTime(start);
+                } else {
+                    newmodel.setStartTime(model.getStartTime());
                 }
 
-                page = this.doSqlData(sensor, points, model);
+                page = this.doSqlData(sensor, points, newmodel);
                 page.setTotal(totalDays * model.getNumPerDay());
 
             } else {
@@ -156,7 +158,7 @@ public class DataServiceImpl implements DataService {
             sqlWhere = sqlWhere + " AND " + timeField + " >= '" + DateUtil.format(model.getStartTime()) + "'";
         }
         if (model.getEndTime() != null) {
-            sqlWhere = sqlWhere + " AND " + timeField + " <= '" + DateUtil.format(model.getEndTime()) + "'";
+            sqlWhere = sqlWhere + " AND " + timeField + " < '" + DateUtil.format(model.getEndTime()) + "'";
         }
         String sqlOrder = " ORDER BY " + timeField + " DESC";
         String sqlLimit = "";