From 8c5f85b49980ce76fe0d2d99328d0aa877d409fb Mon Sep 17 00:00:00 2001
From: qiaoqinzheng <qiaoqinzheng@hivekion.com>
Date: Wed, 24 Jan 2024 18:06:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=9F=E8=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E7=B4=A0=E6=96=B9=E6=B3=95=E6=96=B0=E5=A2=9E=E6=A0=87=E8=AF=86?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E5=B7=B2=E7=BB=8F=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8=E8=BF=87=E5=BD=93=E5=89=8D=E6=97=A5=E6=9C=9F=20?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=9F=E8=AE=A1=E6=A0=B8=E7=B4=A0=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E8=BF=94=E5=9B=9E=E5=86=85=E5=AE=B9=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E5=85=A8=E6=97=A5=E6=9C=9F=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/GardsSampleDataWebServiceImpl.java       | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java
index a0fc5ab8..d76ca472 100644
--- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java
+++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java
@@ -885,8 +885,7 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl<GardsSampleDataWe
             return result;
         }
         String endTime = DateUtils.formatDate(endDate, "yyyy-MM-dd") + " 23:59:59";
-        List<String> allDayTime = DateUtils.getAllDayTime(DateUtils.formatDate(startDate, "yyyy-MM-dd"), DateUtils.formatDate(endDate, "yyyy-MM-dd"));
-        resultMap.put("AllDayTime", allDayTime);
+        List<String> allDayTime = DateUtils.getAllDay(DateUtils.formatDate(startDate, "yyyy-MM-dd"), DateUtils.formatDate(endDate, "yyyy-MM-dd"));
         //判断查询的核素内容是否为空
         List<String> nuclideNameList = new LinkedList<>();
         if (nuclideNames != null && nuclideNames.length > 0) {
@@ -1172,6 +1171,8 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl<GardsSampleDataWe
         for (int i=0; i< allDateTime.size(); i++) {
             //根据下标获取日期时间
             String dayTime = allDateTime.get(i);
+            //新增标识判断是否包含 可能存在一天有多条数据的情况
+            boolean isHave = false;
             //遍历查询结果数组
             for (int j=0; j< nuclideStatisticsMap.size(); j++) {
                 //根据下标获取核素查询结果
@@ -1180,8 +1181,8 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl<GardsSampleDataWe
                 Object collectStart = nuclideStatistics.get("COLLECT_START");
                 //采集开始时间转为字符串
                 String collectStartStr = collectStart.toString();
-                //截取采集开始时间的年月日小时
-                collectStartStr = collectStartStr.substring(0, collectStartStr.indexOf(StringPool.COLON)) + ":00:00";
+                //截取采集开始时间的年月日
+                collectStartStr = collectStartStr.substring(0, 10);
                 //如果采集时间包含当前日期 则正常的读取数据并存入数组
                 if (dayTime.equals(collectStartStr)) {
                     collectStartList.add(collectStart.toString());
@@ -1240,11 +1241,11 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl<GardsSampleDataWe
                             }
                         }
                     }
-                    break;
+                    isHave = true;
                 } else { //如果采集时间不包含当前日期 各数组填补null
                     //如果全数组遍历后都没有 就填充空数据
-                    if (j == nuclideStatisticsMap.size()-1) {
-                        collectStartList.add(dayTime);
+                    if (j == nuclideStatisticsMap.size()-1 && !isHave) {
+                        collectStartList.add(dayTime+" 00:00:00");
                         quantityList.add(null);
                         acqLiveSecList.add(null);
                         //判断系统类型决定读取核素的信息