|
|
@@ -270,10 +270,10 @@ public class Activity {
|
|
|
}
|
|
|
|
|
|
public Integer getActivityStatus(){
|
|
|
- if (this.endTime == null){
|
|
|
+ if (this.enrollDeadline == null){
|
|
|
return ActivityStatus.ENROLL.getCode();
|
|
|
}
|
|
|
- if (new Date().getTime() > this.endTime.getTime()){
|
|
|
+ if (new Date().getTime() > this.enrollDeadline.getTime()){
|
|
|
return ActivityStatus.CLOSED.getCode();
|
|
|
}
|
|
|
return ActivityStatus.ENROLL.getCode();
|