更新10.16
This commit is contained in:
parent
5c3391599e
commit
7287f92406
@ -1903,7 +1903,8 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
|
||||
dateTime = DateUtil.beginOfMonth(parse);
|
||||
dateTime1 = DateUtil.endOfMonth(parse);
|
||||
} 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));
|
||||
dateTime1 = DateUtil.endOfHour(dateTime);
|
||||
} else {
|
||||
@ -2134,7 +2135,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
|
||||
dateTime1 = DateUtil.endOfMonth(parse);
|
||||
} else if (type == 2) {
|
||||
DateTime parse = DateUtil.parse(time);
|
||||
params.put("time", time);
|
||||
params.put("time", parse.toString("MM-dd HH:mm"));
|
||||
dateTime = DateUtil.beginOfHour(parse);
|
||||
dateTime1 = DateUtil.endOfHour(dateTime);
|
||||
} else {
|
||||
|
Loading…
Reference in New Issue
Block a user