Browse Source

截止日期过滤

KeYuan 8 years ago
parent
commit
69156d1ef7
1 changed files with 3 additions and 2 deletions
  1. 3 2
      src/main/java/com/key/dwsurvey/action/nologin/ResponseAction.java

+ 3 - 2
src/main/java/com/key/dwsurvey/action/nologin/ResponseAction.java

@@ -157,9 +157,10 @@ public class ResponseAction extends ActionSupport {
 		Date endTime = surveyDetail.getEndTime();
 		Integer anserNum = directory.getAnswerNum();
 
-//		|| (endTime!=null && ynEndTime==1 && endTime.getTime() < (new Date().getTime())
 		if (directory.getSurveyQuNum() <= 0
-				|| directory.getSurveyState() != 1 || (anserNum!=null && ynEndNum==1 && anserNum > endNum )) {
+				|| directory.getSurveyState() != 1 ||
+				(anserNum!=null && ynEndNum==1 && anserNum > endNum ) ||
+				(endTime!=null && ynEndTime==1 && endTime.getTime() < (new Date().getTime())) ){
 			request.setAttribute("surveyName", "目前该问卷已暂停收集,请稍后再试");
 			request.setAttribute("msg", "目前该问卷已暂停收集,请稍后再试");
 			return RESPONSE_MSG;