renkang/xj-platform
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改监测数据时间统计维度

Browse Source
This commit is contained in:
feng
2025-12-17 17:49:36 +08:00
parent 19f6973a1f
commit 9686399c80
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDataServiceImpl.java
+6 -4
View File
@@ -1390,18 +1390,20 @@ public class WatchDataServiceImpl extends ServiceImpl<WatchDataMapper, WatchData
private Date dateByType(String type,boolean isEnd){
Date date;
Date now = new Date();
// PS : 之前的业务中是按自然周 ,自然月,自然年统计查询 ,20251217新疆项目改为近一周,近一月,近一年
switch (type){
case "week":
date = isEnd? DateUtil.endOfWeek(new Date()).offset(DateField.MILLISECOND,-999) : DateUtil.beginOfWeek(new Date());
date = isEnd? now : DateUtil.beginOfDay(DateUtil.offsetWeek(now,-1));
break;
case "month":
date = isEnd? DateUtil.endOfMonth(new Date()).offset(DateField.MILLISECOND,-999) : DateUtil.beginOfMonth(new Date());
date = isEnd? now : DateUtil.beginOfDay(DateUtil.offsetMonth(now,-1));
break;
case "year":
date = isEnd? DateUtil.endOfYear(new Date()).offset(DateField.MILLISECOND,-999) : DateUtil.beginOfYear(new Date());
date = isEnd? now : DateUtil.beginOfDay(DateUtil.offset(now,DateField.YEAR,-1));
break;
default:
date = isEnd? DateUtil.endOfDay(new Date()).offset(DateField.MILLISECOND,-999) : DateUtil.beginOfDay(new Date());
date = isEnd? now : DateUtil.beginOfDay(new Date());
break;
}
return date;