|
@@ -62,7 +62,9 @@ public class TEquipmentDTO extends TEquipment {
|
|
}
|
|
}
|
|
|
|
|
|
public void setOccurrenceTime(Date occurrenceTime) {
|
|
public void setOccurrenceTime(Date occurrenceTime) {
|
|
- this.hasTodayAlarm = DateUtils.isSameDay(new Date(),occurrenceTime);
|
|
|
|
- this.occurrenceTime = occurrenceTime;
|
|
|
|
|
|
+ if(null != occurrenceTime){
|
|
|
|
+ this.hasTodayAlarm = DateUtils.isSameDay(new Date(),occurrenceTime);
|
|
|
|
+ this.occurrenceTime = occurrenceTime;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|