|
|
@ -147,7 +147,7 @@ public class MesEarlyWarningServiceImpl implements IMesEarlyWarningService {
|
|
|
|
Date shiftStartTime = sdf1.parse(tempStartDatetime);
|
|
|
|
Date shiftStartTime = sdf1.parse(tempStartDatetime);
|
|
|
|
//如果小于当前时间,显示前一天的统计
|
|
|
|
//如果小于当前时间,显示前一天的统计
|
|
|
|
Calendar calendar = Calendar.getInstance();
|
|
|
|
Calendar calendar = Calendar.getInstance();
|
|
|
|
if (shiftStartTime.before(now)) {
|
|
|
|
if (now.before(shiftStartTime)) {
|
|
|
|
calendar.setTime(now);
|
|
|
|
calendar.setTime(now);
|
|
|
|
calendar.add(Calendar.DATE, -1);
|
|
|
|
calendar.add(Calendar.DATE, -1);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|