admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guo 2024-02-02 09:23:55 +08:00
parent 90a2adfa4f
commit 603b368a04
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/smartgrout/service/impl/SmartGroutDataServiceImpl.java
View File

@ -135,7 +135,7 @@ public class SmartGroutDataServiceImpl extends ServiceImpl<SmartGroutDataMapper,
List<String> dateTimeStrList; List<String> dateTimeStrList;
String format; String format;
if (Objects.equals(type, 1)) { if (Objects.equals(type, 1)) {
dateTimeStrList = DateUtils.getDateTimeStrList(100, "HH:00"); dateTimeStrList = DateUtils.getDateTimeStrList(100, "yyyy-MM-dd HH:00");
format = "HH:00"; format = "HH:00";
} else if (Objects.equals(type, 2)) { } else if (Objects.equals(type, 2)) {
dateTimeStrList = DateUtils.getDateTimeStrList(60, "yyyy-MM-dd"); dateTimeStrList = DateUtils.getDateTimeStrList(60, "yyyy-MM-dd");

2
src/main/java/com/zhgd/xmgl/modules/smarttension/service/impl/SmartTensionDataServiceImpl.java
View File

@ -140,7 +140,7 @@ public class SmartTensionDataServiceImpl extends ServiceImpl<SmartTensionDataMap
trendVos.add(new TrendVo("合格率", "2")); trendVos.add(new TrendVo("合格率", "2"));
List<TrendOneVo> list = baseMapper.countQualifiedTrend(paramMap); List<TrendOneVo> list = baseMapper.countQualifiedTrend(paramMap);
if (Objects.equals(type, 1)) { 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"; String format = "HH:00";
return TrendVo.getTrendVos(trendVos, list, dateTimeStrList, format); return TrendVo.getTrendVos(trendVos, list, dateTimeStrList, format);
} else if (Objects.equals(type, 2)) { } else if (Objects.equals(type, 2)) {