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 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 list = baseMapper.countQualifiedTrend(paramMap); if (Objects.equals(type, 1)) { - List dateTimeStrList = DateUtils.getDateTimeStrList(100, "HH:00"); + List 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)) {