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