|
@@ -54,11 +54,11 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
|
|
|
Date yeTime = DateUtils.addDays(eTime,-1);
|
|
|
List<CommonIcoVO> list = new ArrayList<>();
|
|
|
if (null != siteId){
|
|
|
- list.add(getTreedBySite("昨日", siteId, sTime, eTime));
|
|
|
- list.add(getTreedBySite("今日", siteId, ysTime, yeTime));
|
|
|
+ list.add(getTreedBySite("昨日", siteId, ysTime, yeTime));
|
|
|
+ list.add(getTreedBySite("今日", siteId, sTime, eTime));
|
|
|
}else {
|
|
|
- list.add(getTrendOne("昨日", userId, sTime));
|
|
|
- list.add(getTrendOne("今日", userId, yeTime));
|
|
|
+ list.add(getTrendOne("昨日", userId, ysTime));
|
|
|
+ list.add(getTrendOne("今日", userId, sTime));
|
|
|
}
|
|
|
return list;
|
|
|
}
|