改进问卷查询功能#4

src/main/java/com/key/dwsurvey/action/MySurveyAction.java

@@ -41,7 +41,7 @@ public class MySurveyAction extends CrudActionSupport<SurveyDirectory, String>{
 	@Override
 	public String list() throws Exception {
 		HttpServletRequest request=Struts2Utils.getRequest();
-	    page=surveyDirectoryManager.findByUser(page);
+	    page=surveyDirectoryManager.findByUser(page,entity);
 	    return SUCCESS;
 	}
 	
@@ -118,5 +118,9 @@ public class MySurveyAction extends CrudActionSupport<SurveyDirectory, String>{
 	public void prepareSurveyState() throws Exception {
 		prepareModel();
 	}
+
+	public void prepareExecute() throws Exception {
+		prepareModel();
+	}
 	
 }

src/main/java/com/key/dwsurvey/service/SurveyDirectoryManager.java

@@ -63,7 +63,7 @@ public interface SurveyDirectoryManager extends BaseService<SurveyDirectory, Str
 	
 	public void saveAll(SurveyDirectory directory);
 
-	public Page<SurveyDirectory> findByUser(Page<SurveyDirectory> page);
+	public Page<SurveyDirectory> findByUser(Page<SurveyDirectory> page,SurveyDirectory surveyDirectory);
 	
 	public Page<SurveyDirectory> findByGroup(String groupId1,String groupId2,Page<SurveyDirectory> page);
 

src/main/java/com/key/dwsurvey/service/impl/SurveyDirectoryManagerImpl.java

@@ -439,16 +439,31 @@ public class SurveyDirectoryManagerImpl extends BaseServiceImpl<SurveyDirectory,
 	}
 	
 	@Override
-	public Page<SurveyDirectory> findByUser(Page<SurveyDirectory> page) {
+	public Page<SurveyDirectory> findByUser(Page<SurveyDirectory> page,
+											SurveyDirectory entity) {
 	    User user=accountManager.getCurUser();
 	    if(user!=null){
-		Criterion cri1=Restrictions.eq("userId", user.getId());
-		Criterion cri2=Restrictions.eq("visibility", 1);
-		Criterion cri3=Restrictions.eq("dirType", 2);//非目录而是问卷
-		Criterion cri4=Restrictions.eq("surveyModel", 1);//问卷模块
-		page.setOrderBy("createDate");
-		page.setOrderDir("desc");
-		page=surveyDirectoryDao.findPage(page, cri1, cri2, cri3, cri4);
+			List<Criterion> criterions=new ArrayList<Criterion>();
+
+			criterions.add(Restrictions.eq("userId", user.getId()));
+			criterions.add(Restrictions.eq("visibility", 1));
+			criterions.add(Restrictions.eq("dirType", 2));
+			criterions.add(Restrictions.eq("surveyModel", 1));
+
+			if(entity!=null){
+				Integer surveyState = entity.getSurveyState();
+				if(surveyState!=null && !"".equals(surveyState)){
+					criterions.add(Restrictions.eq("surveyState", surveyState));
+				}
+				String surveyName = entity.getSurveyName();
+				if(surveyName!=null && !"".equals(surveyName)){
+					criterions.add(Restrictions.like("surveyName", "%"+surveyName+"%"));
+				}
+			}
+
+			page.setOrderBy("createDate");
+			page.setOrderDir("desc");
+			page=surveyDirectoryDao.findPageList(page,criterions);
 	    }
 	    return page;
 	}

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

@@ -82,18 +82,20 @@ button {
 							所有问卷  |  
 								<a href="${ctx }/design/my-survey-create!save.action" id="surveyAdd-a" style="outline: none;text-decoration: none;" ><i class="fa fa-plus " aria-hidden="true"></i>&nbsp;新建问卷</a>
 							</div>
-							
+
+							<form action="${ctx}/design/my-survey.action" method="post" >
 							<div class="contacts_search" style="padding: 5px;color:#666565;" >
 								<div style="padding-left: 20px;padding-top: 8px;padding-bottom: 8px;">
 									<span style="font-size: 14px;vertical-align: middle;">状态&nbsp;</span>
-									<select style="vertical-align: middle;">  <option>不限</option><option>设计</option><option>发布</option><option>结束</option> </select>
+									<select name="surveyState" style="vertical-align: middle;">  <option value="">不限</option><option value="0">设计</option><option value="1">发布</option><option value="2">结束</option> </select>
 									&nbsp;&nbsp;
 									<span style="font-size: 14px;vertical-align: middle;">名称&nbsp;</span>
-									<input type="text" class="inputS1">
+									<input type="text" class="inputS1" name="surveyName" value="${surveyName}">
 									<input type="submit" value="查询" class="sbtn25 sbtn25_1" style="font-size: 16px;"/>
 								</div>
 								
 							</div>
+							</form>
 							
 							<div style="margin-top: 15px;">
 							<!-- <div style="padding: 5px;color: #666565;text-align: right;">
@@ -184,6 +186,9 @@ button {
 
 
 <script type="text/javascript">
+
+	$("select[name='surveyState']").val("${surveyState}");
+
 var options={
 		animation:true,
 		delay:100,