dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新10.16

Browse Source
This commit is contained in:
许允枞 2024-10-16 13:11:01 +08:00
parent 5c3391599e
commit 7287f92406
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
View File

@ -1903,7 +1903,8 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
dateTime = DateUtil.beginOfMonth(parse); dateTime = DateUtil.beginOfMonth(parse);
dateTime1 = DateUtil.endOfMonth(parse); dateTime1 = DateUtil.endOfMonth(parse);
} else if (type == 2) { } else if (type == 2) {
mapData.put("day", day); DateTime parse = DateUtil.parse(day);
mapData.put("day", parse.toString("MM-dd HH:mm"));
dateTime = DateUtil.beginOfHour(DateUtil.parse(day)); dateTime = DateUtil.beginOfHour(DateUtil.parse(day));
dateTime1 = DateUtil.endOfHour(dateTime); dateTime1 = DateUtil.endOfHour(dateTime);
} else { } else {
@ -2134,7 +2135,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
dateTime1 = DateUtil.endOfMonth(parse); dateTime1 = DateUtil.endOfMonth(parse);
} else if (type == 2) { } else if (type == 2) {
DateTime parse = DateUtil.parse(time); DateTime parse = DateUtil.parse(time);
params.put("time", time); params.put("time", parse.toString("MM-dd HH:mm"));
dateTime = DateUtil.beginOfHour(parse); dateTime = DateUtil.beginOfHour(parse);
dateTime1 = DateUtil.endOfHour(dateTime); dateTime1 = DateUtil.endOfHour(dateTime);
} else { } else {