From 603b368a045d994c3daf115ccf246038c02f426d Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Fri, 2 Feb 2024 09:23:55 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../smartgrout/service/impl/SmartGroutDataServiceImpl.java      | 2 +-
 .../smarttension/service/impl/SmartTensionDataServiceImpl.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/smartgrout/service/impl/SmartGroutDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/smartgrout/service/impl/SmartGroutDataServiceImpl.java
index 25b5b237e..8081e202a 100644
--- a/src/main/java/com/zhgd/xmgl/modules/smartgrout/service/impl/SmartGroutDataServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/smartgrout/service/impl/SmartGroutDataServiceImpl.java
@@ -135,7 +135,7 @@ public class SmartGroutDataServiceImpl extends ServiceImpl<SmartGroutDataMapper,
         List<String> dateTimeStrList;
         String format;
         if (Objects.equals(type, 1)) {
-            dateTimeStrList = DateUtils.getDateTimeStrList(100, "HH:00");
+            dateTimeStrList = DateUtils.getDateTimeStrList(100, "yyyy-MM-dd HH:00");
             format = "HH:00";
         } else if (Objects.equals(type, 2)) {
             dateTimeStrList = DateUtils.getDateTimeStrList(60, "yyyy-MM-dd");
diff --git a/src/main/java/com/zhgd/xmgl/modules/smarttension/service/impl/SmartTensionDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/smarttension/service/impl/SmartTensionDataServiceImpl.java
index fcac02105..ba09407af 100644
--- a/src/main/java/com/zhgd/xmgl/modules/smarttension/service/impl/SmartTensionDataServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/smarttension/service/impl/SmartTensionDataServiceImpl.java
@@ -140,7 +140,7 @@ public class SmartTensionDataServiceImpl extends ServiceImpl<SmartTensionDataMap
         trendVos.add(new TrendVo("合格率", "2"));
         List<TrendOneVo> list = baseMapper.countQualifiedTrend(paramMap);
         if (Objects.equals(type, 1)) {
-            List<String> dateTimeStrList = DateUtils.getDateTimeStrList(100, "HH:00");
+            List<String> dateTimeStrList = DateUtils.getDateTimeStrList(100, "yyyy-MM-dd HH:00");
             String format = "HH:00";
             return TrendVo.getTrendVos(trendVos, list, dateTimeStrList, format);
         } else if (Objects.equals(type, 2)) {