解决定时结束问卷收集问题

README.md

@@ -2,7 +2,7 @@
 
 DWSurvey是一款方便、高效、实用的调研问卷系统，一款基于 JAVA WEB 的开源问卷表单系统。
 
-![可视化问卷设计](http://file.diaowen.net/images/gif/dwsurvey-2.gif "可视化问卷编辑器")
+<img src="http://file.diaowen.net/images/gif/dwsurvey-2.gif" alt="可视化问卷设计" align="bottom" />
 
 ## 演示地址
 
@@ -82,6 +82,9 @@ DWSurvey是一款方便、高效、实用的调研问卷系统，一款基于 JA
 
 调问网交流QQ群 ```群1：635994795(满)```，```群2：301105635(满)```, 群3：811287103(可加)（加群时请说明来由）
 
+微信：
+<img src="https://www.surveyform.cn/images/dwsurvey_wx_28261618534356.jpg" alt="图片替换文本" width="200" height="200" align="top" />
+
 ## 源代码地址
 
 github: https://github.com/wkeyuan/DWSurvey

src/main/java/com/key/dwsurvey/action/survey/MySurveyDesignAction.java

@@ -14,6 +14,7 @@ import com.key.dwsurvey.service.SurveyDirectoryManager;
 import com.key.dwsurvey.service.SurveyReqUrlManager;
 import com.key.dwsurvey.service.SurveyStyleManager;
 import com.opensymphony.xwork2.ActionSupport;
+import org.apache.commons.lang.time.DateUtils;
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.convention.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +28,7 @@ import javax.servlet.http.HttpServletResponseWrapper;
 import java.io.*;
 import java.net.URLDecoder;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -54,7 +56,7 @@ public class MySurveyDesignAction extends ActionSupport{
 	protected final static String PREVIEWDEV="previewDev";
 	protected final static String COLLECTSURVEY="collectSurvey";
 	protected final static String RELOADDESIGN="reloadDesign";
-	
+
 	@Autowired
 	private QuestionManager questionManager;
 	@Autowired
@@ -67,19 +69,19 @@ public class MySurveyDesignAction extends ActionSupport{
 	private AccountManager accountManager;
 
 	private String surveyId;
-	
+
 	@Override
 	public String execute() throws Exception {
 		buildSurvey();
 		return SUCCESS;
 	}
-	
+
 	public String previewDev() throws Exception {
 		buildSurvey();
-		
+
 		return PREVIEWDEV;
 	}
-	
+
 	public String devSurvey() throws Exception {
 		SurveyDirectory survey=surveyDirectoryManager.get(surveyId);
 		Date createDate=survey.getCreateDate();
@@ -105,7 +107,7 @@ public class MySurveyDesignAction extends ActionSupport{
 		}
 		return COLLECTSURVEY;
 	}
-	
+
 	private void buildSurvey() {
 		//判断是否拥有权限
 		User user= accountManager.getCurUser();
@@ -122,7 +124,7 @@ public class MySurveyDesignAction extends ActionSupport{
 				Struts2Utils.setReqAttribute("survey", surveyDirectory);
 				SurveyStyle surveyStyle=surveyStyleManager.getBySurveyId(surveyId);
 				Struts2Utils.setReqAttribute("surveyStyle", surveyStyle);
-				
+
 				Struts2Utils.setReqAttribute("prevHost", DiaowenProperty.STORAGE_URL_PREFIX);
 			}else{
 				Struts2Utils.setReqAttribute("msg", "未登录或没有相应数据权限");
@@ -151,15 +153,15 @@ public class MySurveyDesignAction extends ActionSupport{
 		String endTime=request.getParameter("endTime");
 		String showShareSurvey=request.getParameter("showShareSurvey");
 		String showAnswerDa=request.getParameter("showAnswerDa");
-		
-		
+
+
 		SurveyDirectory survey=surveyDirectoryManager.getSurvey(surveyId);
 		SurveyDetail surveyDetail=survey.getSurveyDetail();
 		User user= accountManager.getCurUser();
 		if(user!=null && survey!=null){
 			String userId=user.getId();
 			if(userId.equals(survey.getUserId())){
-				
+
 				if( svyNote!=null){
 					svyNote=URLDecoder.decode(svyNote,"utf-8");
 					surveyDetail.setSurveyNote(svyNote);
@@ -190,13 +192,15 @@ public class MySurveyDesignAction extends ActionSupport{
 				    surveyDetail.setYnEndNum(Integer.parseInt(ynEndNum));
 				    //surveyDetail.setEndNum(Integer.parseInt(endNum));
 				    if(endNum!=null && endNum.matches("\\d*")){
-					surveyDetail.setEndNum(Integer.parseInt(endNum));			
+					surveyDetail.setEndNum(Integer.parseInt(endNum));
 				    }
 				}
 				if(ynEndTime!=null && !"".equals(ynEndTime)){
 				    surveyDetail.setYnEndTime(Integer.parseInt(ynEndTime));
-//				    surveyDetail.setEndTime(endTime);
-				    surveyDetail.setEndTime(new Date());
+				    if(endTime!=null){
+						SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+						surveyDetail.setEndTime(simpleDateFormat.parse(endTime));
+					}
 				}
 				if(showShareSurvey!=null && !"".equals(showShareSurvey)){
 				    surveyDetail.setShowShareSurvey(Integer.parseInt(showShareSurvey));
@@ -206,17 +210,17 @@ public class MySurveyDesignAction extends ActionSupport{
 				    surveyDetail.setShowAnswerDa(Integer.parseInt(showAnswerDa));
 				    survey.setViewAnswer(Integer.parseInt(showAnswerDa));
 				}
-				
+
 				surveyDirectoryManager.save(survey);
 
 				response.getWriter().write("true");
-				
+
 			}
 		}
-		
+
 		return NONE;
 	}
-	
+
 	public String getSurveyId() {
 		return surveyId;
 	}
@@ -238,7 +242,7 @@ public class MySurveyDesignAction extends ActionSupport{
 		surveyId=directory.getId();
 		return RELOADDESIGN;
 	}
-	
+
 	private void buildSurveyHtml() throws Exception{
 		HttpServletRequest request=Struts2Utils.getRequest();
 		HttpServletResponse response=Struts2Utils.getResponse();
@@ -251,7 +255,7 @@ public class MySurveyDesignAction extends ActionSupport{
 		// 这是生成的html文件名,如index.htm.
 		name = "/survey.htm";
 		name = sc.getRealPath(name);
-		
+
 		RequestDispatcher rd = sc.getRequestDispatcher(url);
 		final ByteArrayOutputStream os = new ByteArrayOutputStream();
 
@@ -264,7 +268,7 @@ public class MySurveyDesignAction extends ActionSupport{
 				os.write(b);
 			}
 		};
-		
+
 		final PrintWriter pw = new PrintWriter(new OutputStreamWriter(os,"utf-8"));
 
 		HttpServletResponse rep = new HttpServletResponseWrapper(response) {
@@ -280,17 +284,17 @@ public class MySurveyDesignAction extends ActionSupport{
 //		rd.include(request, rep);
 		rd.forward(request,rep);
 		pw.flush();
-		
+
 		// 把jsp输出的内容写到xxx.htm
 		File file = new File(name);
 		if (!file.exists()) {
 			file.createNewFile();
 		}
 		FileOutputStream fos = new FileOutputStream(file);
-		
+
 		os.writeTo(fos);
 		fos.close();
 	}
 
-	
+
 }

src/main/resources/conf/security/applicationContext-shiro.xml

@@ -2,31 +2,30 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:util="http://www.springframework.org/schema/util"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-                        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.0.xsd
                         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
 	default-lazy-init="true">
 
 	<description>Shiro安全配置</description>
-	
+
 	<bean id="shiroDbRealm" class="com.key.common.plugs.security.ShiroDbRealm" />
 
 	<!-- <bean id="securityManager" class="org.apache.shiro.web.mgt.DefaultWebSecurityManager">
 		<property name="realm" ref="shiroDbRealm" />
-		<property name="rememberMeManager" ref="rememberMeManager"/>  
+		<property name="rememberMeManager" ref="rememberMeManager"/>
 	</bean>
 	 -->
 	  <bean id="securityManager" class="com.key.common.plugs.security.MyDefaultWebSecurityManager">
 		<property name="realm" ref="shiroDbRealm" />
-		<property name="rememberMeManager" ref="rememberMeManager"/>  
+		<property name="rememberMeManager" ref="rememberMeManager"/>
 	</bean>
-	 
+
 	<bean id="formAuthFilter" class="com.key.common.plugs.security.FormAuthenticationWithLockFilter">
 		<property name="maxLoginAttempts" value="100"/>
 		<property name="successAdminUrl" value="/main.action?menu=3"/>
 		<property name="successAdminRole" value="admin"/>
 		<property name="rememberMeParam" value="rememberMe"/>
 	</bean>
-	
+
 	<bean id="shiroFilter" class="org.apache.shiro.spring.web.ShiroFilterFactoryBean">
 		<property name="securityManager" ref="securityManager" />
 		<property name="loginUrl" value="/login.jsp" />
@@ -52,7 +51,7 @@
 	<bean id="cacheManager" class="org.apache.shiro.cache.MemoryConstrainedCacheManager" />
 
 	<bean id="lifecycleBeanPostProcessor" class="org.apache.shiro.spring.LifecycleBeanPostProcessor" />
-	
+
 	<!-- 使用记住我功能 -->
 	<!-- 会话Cookie模板 -->
 	<bean id="sessionIdCookie" class="org.apache.shiro.web.servlet.SimpleCookie">
@@ -70,5 +69,5 @@
 	    <property name="cipherKey" value="#{T(org.apache.shiro.codec.Base64).decode('4AvVhmFLUs0KTA3Kprsdag==')}"/>
 	     <property name="cookie" ref="rememberMeCookie"/>
 	</bean>
-	
-</beans>
+
+</beans>

src/main/webapp/WEB-INF/page/content/diaowen-design/design-survey.jsp

@@ -20,10 +20,10 @@
 <script type="text/javascript" charset="utf-8" src="${ctx }/js/plugs/ueditor1_4_2-utf8-jsp/lang/zh-cn/zh-cn.js"></script>
 <script type="text/javascript" src="${ctx }/js/dw/dwsurvey-design.js"></script>
 <script type="text/javascript" src="${ctx }/js/dw/address.js"></script>
-<script language="javascript" type="text/javascript" src="${ctx }/js/plugs/My97DatePickerBeta/My97DatePicker/WdatePicker.js"></script>
+<%--<script language="javascript" type="text/javascript" src="${ctx }/js/plugs/My97DatePickerBeta/My97DatePicker/WdatePicker.js"></script>--%>
+<script language="javascript" type="text/javascript" src="${ctx }/js/plugs/laydate/laydate.js"></script>
 <link href="${ctx }/css/design-survey.css" rel="stylesheet" type="text/css" />
-
-<!--[if lt IE 7]><link rel="stylesheet" href="ie-stuff.css" type="text/css" media="screen"/><![endif]--> 
+<!--[if lt IE 7]><link rel="stylesheet" href="ie-stuff.css" type="text/css" media="screen"/><![endif]-->
 <script type="text/javascript">
 </script>
 </head>
@@ -80,10 +80,10 @@
 								<input type="hidden" name="hv" value="2">
 								<input type="hidden" name="randOrder" value="0">
 								<input type="hidden" name="cellCount" value="0">
-								
+
 								<input type="hidden" name="contactsAttr" value="0">
 								<input type="hidden" name="contactsField" value="0">
-								
+
 								<div class="quLogicInputCase">
 								<input type="hidden" name="quLogicItemNum" value="0">
 								</div>
@@ -157,10 +157,10 @@
 								<input type="hidden" name="hv" value="2">
 								<input type="hidden" name="randOrder" value="0">
 								<input type="hidden" name="cellCount" value="0">
-								
+
 								<input type="hidden" name="contactsAttr" value="0">
 								<input type="hidden" name="contactsField" value="0">
-								
+
 								<div class="quLogicInputCase">
 								<input type="hidden" name="quLogicItemNum" value="0">
 								</div>
@@ -245,13 +245,13 @@
 								<input type="hidden" name="randOrder" value="0">
 								<input type="hidden" name="cellCount" value="0">
 								<input type="hidden" name="checkType" value="NO">
-								
+
 								<input type="hidden" name="answerInputWidth" value="300">
 								<input type="hidden" name="answerInputRow" value="1">
-								
+
 								<input type="hidden" name="contactsAttr" value="0">
 								<input type="hidden" name="contactsField" value="0">
-								
+
 								<div class="quLogicInputCase">
 								<input type="hidden" name="quLogicItemNum" value="0">
 								</div>
@@ -308,7 +308,7 @@
 								<input type="hidden" name="hv" value="2">
 								<input type="hidden" name="randOrder" value="0">
 								<input type="hidden" name="cellCount" value="0">
-								
+
 								<input type="hidden" name="paramInt01" value="1">
 								<input type="hidden" name="paramInt02" value="5">
 								<div class="quLogicInputCase">
@@ -1027,13 +1027,13 @@
 	</div>
 
 	</div>
-	
+
 	<div id="tools_tab2" class="tools_tab_div">
 
 
-	
+
 	</div>
-	
+
 	<div id="toolsPubBtn" >
 		<div class="toolbars" style="padding:10px  15px 10px 0px;">
 			<ul>
@@ -1059,7 +1059,7 @@
 			<h2 class=""><a href="" class="ellipsis">欢迎页</a></h2>
 			<div>
 			<div><h2 class=""><a href="" class="ellipsis">问卷页</a></h2></div>
-			
+
 			<div style="padding-left: 5px;">
 			<h2 class=""><a href="" class="ellipsis">1、请问你的年级是？</a></h2>
 			<h2 class=""><a href="" class="ellipsis">2、请问你的年级是？</a></h2>
@@ -1086,7 +1086,7 @@
 			<div id="dwSurveyNoteEdit" class="editAble dwSvyNoteEdit"  >${survey.surveyDetail.surveyNote }</div>
 			<input type="hidden" name="svyNoteSaveTag" value="1">
 		</div>
-		
+
 		<div id="dwSurveyQuContent" style="min-height: 500px;">
 			<ul id="dwSurveyQuContentAppUl">
 				<!-- 题目内容 -->
@@ -1106,10 +1106,10 @@
 								<input type="hidden" name="hv" value="${en.hv }">
 								<input type="hidden" name="randOrder" value="${en.randOrder }">
 								<input type="hidden" name="cellCount" value="${en.cellCount }">
-								
+
 								<input type="hidden" name="contactsAttr" value="${en.contactsAttr }">
 								<input type="hidden" name="contactsField" value="${en.contactsField }">
-								
+
 								<div class="quLogicInputCase">
 								<input type="hidden" name="quLogicItemNum" value="${fn:length(en.questionLogics) }">
 								<c:forEach items="${en.questionLogics }" var="quLogicEn" varStatus="logicSts">
@@ -1119,7 +1119,7 @@
 										<input type="hidden" name="skQuId" value="${quLogicEn.skQuId }"/>
 										<input type="hidden" name="visibility" value="1">
 										<input type="hidden" name="logicSaveTag" value="1">
-										
+
 										<input type="hidden" name="geLe" value="${quLogicEn.geLe }">
 										<input type="hidden" name="scoreNum" value="${quLogicEn.scoreNum }">
 										<input type="hidden" name="logicType" value="${quLogicEn.logicType }">
@@ -1136,7 +1136,7 @@
 											<li title="删除" class="dwQuDelete"><div class="dwQuIcon"></div></li>
 										</ul>
 								</div>
-								
+
 								<div class="surveyQuItemRightTools">
 										<ul class="surveyQuItemRightToolsUl">
 											<li class="questionUp"><div class="dwQuIcon"></div></li><li class="questionDown"><div class="dwQuIcon"></div></li>
@@ -1220,11 +1220,11 @@
 										</ul>
 									</div>
 								</div>
-								
+
 							</div>
 					</div>
 					</c:when>
-					
+
 					<c:when test="${en.quType eq 'CHECKBOX' }">
 						<div class="surveyQuItemBody">
 							<div class="initLine"></div>
@@ -1238,10 +1238,10 @@
 								<input type="hidden" name="hv" value="${en.hv }">
 								<input type="hidden" name="randOrder" value="${en.randOrder }">
 								<input type="hidden" name="cellCount" value="${en.cellCount }">
-								
+
 								<input type="hidden" name="contactsAttr" value="${en.contactsAttr }">
 								<input type="hidden" name="contactsField" value="${en.contactsField }">
-								
+
 								<div class="quLogicInputCase">
 									<input type="hidden" name="quLogicItemNum" value="${fn:length(en.questionLogics) }">
 									<c:forEach items="${en.questionLogics }" var="quLogicEn" varStatus="logicSts">
@@ -1251,7 +1251,7 @@
 										<input type="hidden" name="skQuId" value="${quLogicEn.skQuId }"/>
 										<input type="hidden" name="visibility" value="1">
 										<input type="hidden" name="logicSaveTag" value="1">
-										
+
 										<input type="hidden" name="geLe" value="${quLogicEn.geLe }">
 										<input type="hidden" name="scoreNum" value="${quLogicEn.scoreNum }">
 										<input type="hidden" name="logicType" value="${quLogicEn.logicType }">
@@ -1268,7 +1268,7 @@
 											<li title="删除" class="dwQuDelete"><div class="dwQuIcon"></div></li>
 										</ul>
 								</div>
-								
+
 								<div class="surveyQuItemRightTools">
 										<ul class="surveyQuItemRightToolsUl">
 											<li class="questionUp"><div class="dwQuIcon"></div></li><li class="questionDown"><div class="dwQuIcon"></div></li>
@@ -1352,11 +1352,11 @@
 										</ul>
 									</div>
 								</div>
-								
+
 							</div>
 					</div>
 					</c:when>
-					
+
 					<c:when test="${en.quType eq 'FILLBLANK' }">
 						<div class="surveyQuItemBody">
 							<div class="initLine"></div>
@@ -1371,10 +1371,10 @@
 								<input type="hidden" name="randOrder" value="${en.randOrder }">
 								<input type="hidden" name="cellCount" value="${en.cellCount }">
 								<input type="hidden" name="checkType" value="${en.checkType }">
-								
+
 								<input type="hidden" name="answerInputWidth" value="${en.answerInputWidth }">
 								<input type="hidden" name="answerInputRow" value="${en.answerInputRow }">
-								
+
 								<input type="hidden" name="contactsAttr" value="${en.contactsAttr }">
 								<input type="hidden" name="contactsField" value="${en.contactsField }">
 								<div class="quLogicInputCase">
@@ -1386,7 +1386,7 @@
 										<input type="hidden" name="skQuId" value="${quLogicEn.skQuId }"/>
 										<input type="hidden" name="visibility" value="1">
 										<input type="hidden" name="logicSaveTag" value="1">
-										
+
 										<input type="hidden" name="geLe" value="${quLogicEn.geLe }">
 										<input type="hidden" name="scoreNum" value="${quLogicEn.scoreNum }">
 										<input type="hidden" name="logicType" value="${quLogicEn.logicType }">
@@ -1403,7 +1403,7 @@
 											<li title="删除" class="dwQuDelete"><div class="dwQuIcon"></div></li>
 										</ul>
 								</div>
-								
+
 								<div class="surveyQuItemRightTools">
 										<ul class="surveyQuItemRightToolsUl">
 											<li class="questionUp"><div class="dwQuIcon"></div></li><li class="questionDown"><div class="dwQuIcon"></div></li>
@@ -1421,11 +1421,11 @@
 											<c:choose>
 												<c:when test="${en.answerInputRow > 1 }">
 													<input type="text" style="width:${empty(en.answerInputWidth)?'300':en.answerInputWidth}px;padding:5px;display: none;" class="quFillblankAnswerInput" >
-													<textarea rows="${en.answerInputRow }" style="width:${empty(en.answerInputWidth)?'300':en.answerInputWidth}px;"class="quFillblankAnswerTextarea" ></textarea>	
+													<textarea rows="${en.answerInputRow }" style="width:${empty(en.answerInputWidth)?'300':en.answerInputWidth}px;"class="quFillblankAnswerTextarea" ></textarea>
 												</c:when>
 												<c:otherwise>
 													<input type="text" style="width:${empty(en.answerInputWidth)?'300':en.answerInputWidth}px;padding:5px;" class="quFillblankAnswerInput" >
-													<textarea rows="${empty(en.answerInputRow)?'1':en.answerInputRow }" style="width:${empty(en.answerInputWidth)?'300':en.answerInputWidth}px;display: none;"class="quFillblankAnswerTextarea" ></textarea>	
+													<textarea rows="${empty(en.answerInputRow)?'1':en.answerInputRow }" style="width:${empty(en.answerInputWidth)?'300':en.answerInputWidth}px;display: none;"class="quFillblankAnswerTextarea" ></textarea>
 												</c:otherwise>
 											</c:choose>
 												<div class="dwFbMenuBtn" ></div>
@@ -1434,11 +1434,11 @@
 									</ul>
 									</div>
 								</div>
-								
+
 							</div>
 					</div>
 					</c:when>
-					
+
 					<c:when test="${en.quType eq 'ORDERQU' }">
 						<div class="surveyQuItemBody">
 							<div class="initLine"></div>
@@ -1461,7 +1461,7 @@
 										<input type="hidden" name="skQuId" value="${quLogicEn.skQuId }"/>
 										<input type="hidden" name="visibility" value="1">
 										<input type="hidden" name="logicSaveTag" value="1">
-										
+
 										<input type="hidden" name="geLe" value="${quLogicEn.geLe }">
 										<input type="hidden" name="scoreNum" value="${quLogicEn.scoreNum }">
 										<input type="hidden" name="logicType" value="${quLogicEn.logicType }">
@@ -1478,7 +1478,7 @@
 											<li title="删除" class="dwQuDelete"><div class="dwQuIcon"></div></li>
 										</ul>
 								</div>
-								
+
 								<div class="surveyQuItemRightTools">
 										<ul class="surveyQuItemRightToolsUl">
 											<li class="questionUp"><div class="dwQuIcon"></div></li><li class="questionDown"><div class="dwQuIcon"></div></li>
@@ -1515,11 +1515,11 @@
 										</ul>
 									</div>
 								</div>
-								
+
 							</div>
 					</div>
 					</c:when>
-					
+
 					<%-- 分页题 --%>
 					<c:when test="${en.quType eq 'PAGETAG' }">
 						<div class="surveyQuItemBody">
@@ -1543,7 +1543,7 @@
 										<input type="hidden" name="skQuId" value="${quLogicEn.skQuId }"/>
 										<input type="hidden" name="visibility" value="1">
 										<input type="hidden" name="logicSaveTag" value="1">
-										
+
 										<input type="hidden" name="geLe" value="${quLogicEn.geLe }">
 										<input type="hidden" name="scoreNum" value="${quLogicEn.scoreNum }">
 										<input type="hidden" name="logicType" value="${quLogicEn.logicType }">
@@ -1557,22 +1557,22 @@
 											<li title="删除" class="dwQuDelete"><div class="dwQuIcon"></div></li>
 										</ul>
 								</div>
-								
+
 								<div class="surveyQuItemRightTools" style="margin-top: 0px;">
 										<ul class="surveyQuItemRightToolsUl">
 											<li class="questionUp"><div class="dwQuIcon"></div></li><li class="questionDown"><div class="dwQuIcon"></div></li>
 										</ul>
 								</div>
-								
+
 								<div class="pageBorderTop nohover"  ></div>
 								<div class="surveyQuItemContent" style="min-height: 10px;text-align: right;">
 									<div class="pageQuContent">下一页（1/2）</div>
 								</div>
-								
+
 							</div>
 					</div>
 					</c:when>
-					
+
 					<%--段落说明 --%>
 					<c:when test="${en.quType eq 'PARAGRAPH' }">
 						<div class="surveyQuItemBody">
@@ -1596,7 +1596,7 @@
 										<input type="hidden" name="skQuId" value="${quLogicEn.skQuId }"/>
 										<input type="hidden" name="visibility" value="1">
 										<input type="hidden" name="logicSaveTag" value="1">
-										
+
 										<input type="hidden" name="geLe" value="${quLogicEn.geLe }">
 										<input type="hidden" name="scoreNum" value="${quLogicEn.scoreNum }">
 										<input type="hidden" name="logicType" value="${quLogicEn.logicType }">
@@ -1613,7 +1613,7 @@
 											<li title="删除" class="dwQuDelete"><div class="dwQuIcon"></div></li>
 										</ul>
 								</div>
-								
+
 								<div class="surveyQuItemRightTools" style="margin-top: 5px;">
 										<ul class="surveyQuItemRightToolsUl">
 											<li class="questionUp"><div class="dwQuIcon"></div></li><li class="questionDown"><div class="dwQuIcon"></div></li>
@@ -1626,11 +1626,11 @@
 										<input type="hidden" name="quTitleSaveTag" value="1">
 									</div>
 								</div>
-								
+
 							</div>
 					</div>
 					</c:when>
-					
+
 					<%--多项填空题 --%>
 					<c:when test="${en.quType eq 'MULTIFILLBLANK' }">
 						<div class="surveyQuItemBody">
@@ -1645,7 +1645,7 @@
 								<input type="hidden" name="hv" value="${en.hv }">
 								<input type="hidden" name="randOrder" value="${en.randOrder }">
 								<input type="hidden" name="cellCount" value="${en.cellCount }">
-								
+
 								<input type="hidden" name="paramInt01" value="${en.paramInt01 }">
 								<input type="hidden" name="paramInt02" value="${en.paramInt02 }">
 								<div class="quLogicInputCase">
@@ -1657,7 +1657,7 @@
 										<input type="hidden" name="skQuId" value="${quLogicEn.skQuId }"/>
 										<input type="hidden" name="visibility" value="1">
 										<input type="hidden" name="logicSaveTag" value="1">
-										
+
 										<input type="hidden" name="geLe" value="${quLogicEn.geLe }">
 										<input type="hidden" name="scoreNum" value="${quLogicEn.scoreNum }">
 										<input type="hidden" name="logicType" value="${quLogicEn.logicType }">
@@ -1674,7 +1674,7 @@
 											<li title="删除" class="dwQuDelete"><div class="dwQuIcon"></div></li>
 										</ul>
 								</div>
-								
+
 								<div class="surveyQuItemRightTools">
 										<ul class="surveyQuItemRightToolsUl">
 											<li class="questionUp"><div class=dwQuIcon></div></li><li class="questionDown"><div class=dwQuIcon></div></li>
@@ -1696,7 +1696,7 @@
 										</tr>
 										</c:forEach>
 									</table>
-									
+
 									</div>
 									<div class="quCoBottomTools" >
 										<ul class="quCoBottomToolsUl" >
@@ -1705,17 +1705,17 @@
 										</ul>
 									</div>
 								</div>
-								
+
 							</div>
 					</div>
 					</c:when>
-					
+
 				</c:choose>
 				</li>
 	</c:forEach>
-				
+
 			</ul>
-				
+
 		</div>
 	</div>
 </div>
@@ -1783,7 +1783,7 @@
 	<input type="hidden" name="skQuId" value="0"/>
 	<input type="hidden" name="visibility" value="0">
 	<input type="hidden" name="logicSaveTag" value="0">
-	
+
 	<input type="hidden" name="geLe" value="le">
 	<input type="hidden" name="scoreNum" value="2">
 	<input type="hidden" name="logicType" value="1">
@@ -1834,7 +1834,7 @@
 			<!-- 默认显示的LOAD -->
 			<div class="dwQuDialogLoad dwQuDialogCon"><img alt="" src="${ctx }/images/load.gif"></div>
 			<!-- 题目设置 -->
-			
+
 			<div class="dwQuSetCon dwQuFormSetDialog dwQuDialogCon" >
 				<ul>
 					<!-- <li><input type="checkbox" name="quChage"><label>切换为多选</label> </li> -->
@@ -1874,7 +1874,7 @@
 				</ul>
 				<div class="dwQuDialogBtnCon" ><input type="button" value="保存" class="quDialogBtn" id="dwDialogQuSetSave"/></div>
 			</div>
-			
+
 			<!-- 逻辑设置 -->
 			<div class="dwQuDialogLogic dwQuDialogCon">
 				<div class="dwQuDialogLogicTitle">逻辑设置</div>
@@ -1883,22 +1883,22 @@
 				<div class="dwQuDialogBotEvent"><div class="dwQuDialogAddLogic"><div class="dwQuIcon"></div></div></div>
 				<div class="dwQuDialogBtnCon" ><input type="button" value="保存" class="quDialogBtn" id="dwDialogSaveLogic"/></div>
 			</div>
-			
+
 			<!-- 批量添加，单选 -->
 			<div class="dwQuAddMore dwQuDialogCon"  >
 				<div class="dwQuTextSpan">每行一个选项</div>
 				<textarea id="dwQuMoreTextarea"></textarea>
 				<div class="dwQuDialogBtnCon" ><input type="button" value="保存" class="quDialogBtn" id="dwDialogSaveMoreItem"/></div>
 			</div>
-			
-			
+
+
 		</div>
 	</div>
 	</form>
 </div>
 
 <div id="modelUIDialog">
-	
+
 	<div id="modelUIDialogContent" >
 	<!-- 填空题  填空数据类型设置  -->
 			<div class="dwQuFillDataTypeOption dwQuFormSetDialog dwQuDialogCon" >
@@ -1912,7 +1912,7 @@
 				</ul>
 				<div class="dwQuDialogBtnCon" ><input type="button" value="保存" class="quDialogBtn" id="dwDialogQuFillOptionSave"/></div>
 			</div>
-	
+
 	<div class="dwQuRadioCheckboxOption dwQuFormSetDialog dwQuDialogCon" >
 				<ul>
 					<li><label>选项设置</label></li>
@@ -1920,7 +1920,7 @@
 				</ul>
 				<div class="dwQuDialogBtnCon" ><input type="button" value="保存" class="quDialogBtn" id="dwDialogQuOptionSetSave"/></div>
 		</div>
-		
+
 		<div class="dwSurveyAttrSetDialog dwQuFormSetDialog dwQuDialogCon" >
 			<div class="tabbarDialog_1" >
 					<div class="p_DialogContent" >
@@ -1940,7 +1940,8 @@
 						<div class="p_DialogContentTitle">何时结束</div>
 						<div class="p_DialogContentRoot">
 								<div class="p_DialogContentItem"><label><input type="checkbox" name="ynEndNum" value="1"> 收集到&nbsp;<input type="text" size="12"  class="inputSytle_1" name="endNum">&nbsp;份答卷时结束</label></div>
-								<div class="p_DialogContentItem"><label><input type="checkbox" name="ynEndTime" value="1"> 到&nbsp;<input type="text" size="20"  class="inputSytle_1 Wdate" onfocus="WdatePicker({minDate:'%y-%M-{%d+1}',dateFmt:'yyyy-MM-dd HH:mm:ss'})" name="endTime">&nbsp;时结束 </label></div>
+<%--								<div class="p_DialogContentItem"><label><input type="checkbox" name="ynEndTime" value="1"> 到&nbsp;<input type="text" size="20"  class="inputSytle_1 Wdate" onfocus="WdatePicker({minDate:'%y-%M-{%d+1}',dateFmt:'yyyy-MM-dd HH:mm:ss'})" name="endTime">&nbsp;时结束 </label></div>--%>
+							<div class="p_DialogContentItem"><label><input type="checkbox" name="ynEndTime" value="1"> 到&nbsp;<input type="text" size="20"  class="inputSytle_1 Wdate" name="endTime" id="surveyEndTime" value="<fmt:formatDate value="${survey.surveyDetail.endTime}" pattern="yyyy-MM-dd HH:mm:ss" />" >&nbsp;时结束 </label></div>
 						</div>
 					</div>
 
@@ -1952,12 +1953,12 @@
 
 
 
-		
+
 		</div>
 </div>
 <script type="text/javascript">
 	if("${survey.surveyDetail.effective}">1){
-		$("input[name='effective']").attr("checked",true);	
+		$("input[name='effective']").attr("checked",true);
 	}else{
 		$("input[name='effective']").attr("checked",false);
 	}
@@ -1969,20 +1970,26 @@
 	$("input[name='ynEndNum'][value='${survey.surveyDetail.ynEndNum}']").attr("checked",true);
 	$("input[name='endNum']").val("${survey.surveyDetail.endNum}");
 	$("input[name='ynEndTime'][value='${survey.surveyDetail.ynEndTime}']").attr("checked",true);
-	$("input[name='endTime']").val("${survey.surveyDetail.endTime}");
+	<%--$("input[name='endTime']").val("${survey.surveyDetail.endTime}");--%>
 	$("input[name='showShareSurvey'][value='${survey.surveyDetail.showShareSurvey}']").attr("checked",true);
 	$("input[name='showAnswerDa'][value='${survey.surveyDetail.showAnswerDa}']").attr("checked",true);
+
+	laydate.render({
+		elem: '#surveyEndTime' //指定元素
+	   ,type: 'datetime'
+	});
+
 </script>
 <%@ include file="/WEB-INF/page/layouts/other.jsp"%>
 <div style="text-align: center;">
 <div class="dw_foot" style="padding-bottom: 30px;">
 	<div class="footer-copyright" style="color: gray;padding-top: 0px;font-size: 16px;">
 		Powered by <a href="http://www.dwsurvey.net" target="_blank" style="text-decoration: none;color: gray;">DWSurvey</a>&nbsp;&nbsp;&nbsp;
-		Copyright © 2012-2017
+		Copyright © 2012-2021
 		<a href="http://www.diaowen.net" target="_blank" style="text-decoration: none;color: rgb(53, 117, 136);">调问网</a>
 	</div>
 </div>
 </div>
 
 </body>
-</html>
+</html>

src/main/webapp/js/plugs/laydate/theme/default/font/iconfont.svg

@@ -0,0 +1,45 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<!--
+2013-9-30: Created.
+-->
+<svg>
+<metadata>
+Created by iconfont
+</metadata>
+<defs>
+
+<font id="laydate-icon" horiz-adv-x="1024" >
+  <font-face
+    font-family="laydate-icon"
+    font-weight="500"
+    font-stretch="normal"
+    units-per-em="1024"
+    ascent="896"
+    descent="-128"
+  />
+    <missing-glyph />
+    
+    <glyph glyph-name="x" unicode="x" horiz-adv-x="1001"
+d="M281 543q-27 -1 -53 -1h-83q-18 0 -36.5 -6t-32.5 -18.5t-23 -32t-9 -45.5v-76h912v41q0 16 -0.5 30t-0.5 18q0 13 -5 29t-17 29.5t-31.5 22.5t-49.5 9h-133v-97h-438v97zM955 310v-52q0 -23 0.5 -52t0.5 -58t-10.5 -47.5t-26 -30t-33 -16t-31.5 -4.5q-14 -1 -29.5 -0.5
+t-29.5 0.5h-32l-45 128h-439l-44 -128h-29h-34q-20 0 -45 1q-25 0 -41 9.5t-25.5 23t-13.5 29.5t-4 30v167h911zM163 247q-12 0 -21 -8.5t-9 -21.5t9 -21.5t21 -8.5q13 0 22 8.5t9 21.5t-9 21.5t-22 8.5zM316 123q-8 -26 -14 -48q-5 -19 -10.5 -37t-7.5 -25t-3 -15t1 -14.5
+t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-5 19 -11 39h-368zM336 498v228q0 11 2.5 23t10 21.5t20.5 15.5t34 6h188q31 0 51.5 -14.5t20.5 -52.5v-227h-327z" />
+    
+
+    
+    <glyph glyph-name="youyou" unicode="&#58882;" d="M283.648 721.918976 340.873216 780.926976 740.352 383.997952 340.876288-12.925952 283.648 46.077952 619.52 383.997952Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="zuozuo" unicode="&#58883;" d="M740.352 721.918976 683.126784 780.926976 283.648 383.997952 683.123712-12.925952 740.352 46.077952 404.48 383.997952Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="xiayiye" unicode="&#58970;" d="M62.573 384.103l423.401 423.662c18.985 18.985 49.757 18.985 68.727 0 18.982-18.972 18.985-49.746 0-68.729l-355.058-355.067 356.796-356.796c18.977-18.971 18.976-49.746 0-68.727-18.982-18.976-49.751-18.976-68.727 0l-39.753 39.753 0.269 0.246-385.655 385.661zM451.365 384.103l423.407 423.662c18.985 18.985 49.757 18.985 68.727 0 18.982-18.972 18.985-49.746 0-68.729l-355.058-355.067 356.796-356.796c18.977-18.971 18.976-49.746 0-68.727-18.982-18.976-49.757-18.977-68.727 0l-39.762 39.754 0.273 0.249-385.662 385.661zM451.365 384.103z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="xiayiye1" unicode="&#58971;" d="M948.066926 382.958838l-411.990051-412.24426c-18.47333-18.47333-48.417689-18.47333-66.875207 0-18.47333 18.461167-18.47333 48.405526 0 66.875207L814.691135 383.088983 467.512212 730.269123c-18.466032 18.458735-18.466032 48.405526 0 66.873991 18.468465 18.464816 48.410391 18.464816 66.872774 0l38.682336-38.682336-0.261507-0.239614 375.259894-375.265975v0.003649m-378.312834 0L157.756743-29.285422c-18.47333-18.47333-48.415256-18.47333-66.872775 0-18.47333 18.461167-18.47333 48.405526 0 66.875207L436.369787 383.088983 89.19208 730.269123c-18.4636 18.458735-18.4636 48.405526 0 66.873991 18.470898 18.464816 48.415256 18.464816 66.872774 0l38.692067-38.682336-0.266372-0.239614 375.267191-375.265975-0.004865 0.003649m0 0z"  horiz-adv-x="1024" />
+
+    
+
+
+  </font>
+</defs></svg>