4.24bug优化

cloud-training-project-service/src/main/java/com/yizhi/training/application/service/impl/TrainingProjectServiceImpl.java

@@ -587,8 +587,8 @@ public class TrainingProjectServiceImpl extends ServiceImpl<TrainingProjectMappe
                             vo.setActivityStateCode(TrEnrollStatusEnum.ACT_WAIT_ENROLL.getCode());
                             vo.setActivityStateName(TrEnrollStatusEnum.ACT_WAIT_ENROLL.getValue());
 
-                            //根据报名开始时间和签到开始时间设置报名活动状态
-                            Date endTime = tr.getSignStartTime();
+                          /* 报名时间就报名时间不去管签到时间  //根据报名开始时间和签到开始时间设置报名活动状态
+                            Date endTime = tr.getStartTime();
                             if(endTime == null){
                                 endTime = tr.getEnrollEndTime();
                             } else {
@@ -598,8 +598,8 @@ public class TrainingProjectServiceImpl extends ServiceImpl<TrainingProjectMappe
                                 if((endTime.after(s) || s.equals(endTime)) && (endTime.before(e) || e.equals(endTime))){
                                     endTime = e;
                                 }
-                            }
-                            state = compareTime(tr.getEnrollStartTime(), endTime);
+                            }*/
+                            state = compareTime(tr.getEnrollStartTime(), tr.getEnrollEndTime());
                             if(state == TrEnrollStatusEnum.ACT_RUN){
                                 vo.setActivityStateCode(TrEnrollStatusEnum.ACT_ENROLL.getCode());
                                 vo.setActivityStateName(TrEnrollStatusEnum.ACT_ENROLL.getValue());