|
@@ -102,11 +102,11 @@ public class BilletHotsendChangeShiftServiceImpl extends ServiceImpl<BilletHotse
|
|
|
// 班别名(白中夜)
|
|
|
String nextShiftName = "";
|
|
|
// 验证23:00 到01:00 之间
|
|
|
- if (ScheduleUtils.isBetweenTime(new Date(), "07:30", "08:30")) {
|
|
|
+ if (ScheduleUtils.isBetweenTime(new Date(), "07:40", "08:30")) {
|
|
|
nextShiftName = "白";
|
|
|
- } else if (ScheduleUtils.isBetweenTime(new Date(), "15:30", "16:30")) {
|
|
|
+ } else if (ScheduleUtils.isBetweenTime(new Date(), "15:40", "16:30")) {
|
|
|
nextShiftName = "中";
|
|
|
- } else if (ScheduleUtils.isBetweenTime(new Date(), "23:30", "01:00")) {
|
|
|
+ } else if (ScheduleUtils.isBetweenTime(new Date(), "23:40", "00:30")) {
|
|
|
nextShiftName = "夜";
|
|
|
}else {
|
|
|
log.info("{}{}", "未在交班范围内,", DateUtils.date2Str(new Date(), DateUtils.datetimeFormat.get()) + "5号机C端自动化交班失败!");
|
|
@@ -202,11 +202,11 @@ public class BilletHotsendChangeShiftServiceImpl extends ServiceImpl<BilletHotse
|
|
|
// 班别名
|
|
|
String nextShiftName = "";
|
|
|
// 验证23:00 到01:00 之间
|
|
|
- if (ScheduleUtils.isBetweenTime(new Date(), "07:30", "08:30")) {
|
|
|
+ if (ScheduleUtils.isBetweenTime(new Date(), "07:40", "08:30")) {
|
|
|
nextShiftName = "白";
|
|
|
- } else if (ScheduleUtils.isBetweenTime(new Date(), "15:30", "16:30")) {
|
|
|
+ } else if (ScheduleUtils.isBetweenTime(new Date(), "15:40", "16:30")) {
|
|
|
nextShiftName = "中";
|
|
|
- } else if (ScheduleUtils.isBetweenTime(new Date(), "23:30", "01:00")) {
|
|
|
+ } else if (ScheduleUtils.isBetweenTime(new Date(), "23:40", "00:30")) {
|
|
|
nextShiftName = "夜";
|
|
|
}else {
|
|
|
log.info("{}{}", "未在交班范围内,", DateUtils.date2Str(new Date(), DateUtils.datetimeFormat.get()) + "6号机C端自动化交班失败!");
|