no message

src/main/java/com/qiankun/controller/rainbowplan/RainbowPlanController.java

@@ -270,6 +270,10 @@ public class RainbowPlanController extends BaseController<Object> {
                 wish.setStatus(Wish.STATUS_PUBLISH);
                 wish.setRainbowPlanUserId(user.getId());
                 wish.setActivityId(publishWish.getActivityId());
+                
+                wish.setChildren(user);
+                wish.setActivity(activityService.findById(publishWish.getActivityId()));
+                
                 wishDao.save(wish);
             }else {
                 throw new Exception("保存失败，请上传图片");
@@ -397,6 +401,10 @@ public class RainbowPlanController extends BaseController<Object> {
         }
         wish.setStatus(Wish.STATUS_RECEIVE);
         wish.setVolunteerId(vo.getUserId());
+        
+        RainbowPlanUser volunteer = userDao.find(vo.getUserId());
+        wish.setVolunteer(volunteer);
+        
         wishDao.save(wish);
         result.put("status","OK");
         return result;
@@ -417,7 +425,7 @@ public class RainbowPlanController extends BaseController<Object> {
             result.put("errorMsg","心愿不存在");
             return result;
         }
-        wish.setVolunteerId(vo.getUserId());
+//        wish.setVolunteerId(vo.getUserId());
         wish.setHelpType(vo.getHelpType());
         if (wish.getHelpType() == Wish.HELP_TYPE_EXPRESS){
             wish.setExpressCompany(vo.getExpressCompany());
@@ -541,7 +549,7 @@ public class RainbowPlanController extends BaseController<Object> {
     @Auth(verifyLogin = false,verifyURL = false)
     @RequestMapping(value = "/testData",method = RequestMethod.GET)
     public String testData(){
-        for (int i=0;i<200;i++){
+        for (int i=0;i<50;i++){
             RainbowPlanUser user = new RainbowPlanUser();
             user.setPhone("136123456"+ RandomUtils.nextInt(10,99));
             user.setName("宝宝"+i);
@@ -560,7 +568,13 @@ public class RainbowPlanController extends BaseController<Object> {
             wish.setUploadImage("/rainbowplan/wishUploadImage/wxd097672957e48ba8.o6zAJs19Nssw1OXAZZr6YDF-tx6U.0fpELldkHhwg5d73b7fa0dc34be23d4dca9ebe797b28.jpeg");
             wish.setStatus(Wish.STATUS_PUBLISH);
             wish.setRainbowPlanUserId(user.getId());
-            wish.setActivityId("c1f41681-0581-45e5-8494-20df3610e2f3");
+            wish.setChildren(user);
+            wish.setActivityId("0d734916-e53f-4fb6-82cc-ff812d8a429d");
+            wish.setActivity(activityService.findById("0d734916-e53f-4fb6-82cc-ff812d8a429d"));
+            
+            RainbowPlanUser volunteer = userDao.find("a23bcd0d-2ad6-4ab1-b16d-199056e9ed95");
+            wish.setVolunteer(volunteer);
+            
             wishDao.save(wish);
         }
         return "OK";

src/main/java/com/qiankun/controller/rainbowplan/RainbowPlanWebController.java

 package com.qiankun.controller.rainbowplan;
 
+import java.util.List;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -12,9 +14,13 @@ import com.qiankun.controller.base.BaseController;
 import com.qiankun.dao.RainbowPlanUserDao;
 import com.qiankun.dao.WishDao;
 import com.qiankun.dao.core.Hints;
+import com.qiankun.entity.Activity;
 import com.qiankun.entity.RainbowPlanUser;
+import com.qiankun.entity.Wish;
 import com.qiankun.pages.IPageList;
+import com.qiankun.service.ActivityService;
 import com.qiankun.vo.RainbowPlanUserVo;
+import com.qiankun.vo.WishVo;
 
 @Controller
 public class RainbowPlanWebController extends BaseController<Object>{
@@ -25,6 +31,8 @@ public class RainbowPlanWebController extends BaseController<Object>{
 	@Autowired
     private WishDao wishDao;
 	
+	@Autowired
+    private ActivityService activityService;
 	
 	@RequestMapping("/rainbow/user/list")
 	public ModelAndView userlist(RainbowPlanUserVo userVo,HttpServletResponse response, HttpServletRequest request) throws Exception {
@@ -46,17 +54,18 @@ public class RainbowPlanWebController extends BaseController<Object>{
 	
 	
 	@RequestMapping("/rainbow/wish/list")
-	public ModelAndView wishlist(RainbowPlanUserVo userVo,HttpServletResponse response, HttpServletRequest request) throws Exception {
+	public ModelAndView wishlist(WishVo wishVo,HttpServletResponse response, HttpServletRequest request) throws Exception {
 		ModelAndView view = new ModelAndView();
-		 
-		 
-        IPageList<RainbowPlanUser> userPage = userDao.findUserPage(userVo.getSearchStr(), userVo.getType(), userVo.getStatus(), userVo.getOrder(), userVo.getSort(), 
-					new Hints(getStartRow(request), getPageCount(request)));
-			
-		view.getModelMap().addAttribute("userPage", userPage);
+		
+		List<Activity> activitylist = activityService.findByAavailableAndType(null, "3");
+		
+        IPageList<Wish> wishPage = wishDao.findPages(wishVo.getSearchStr(), wishVo.getActivityId(), wishVo.getOrder(), wishVo.getSort(), new Hints(getStartRow(request), getPageCount(request)));
+		
+        view.getModelMap().addAttribute("activitylist", activitylist);
+		view.getModelMap().addAttribute("wishPage", wishPage);
 		view.getModelMap().addAttribute("pageCount", getPageCount(request));
 		view.getModelMap().addAttribute("pageNumber", getPageNumber(request));
-		view.getModelMap().addAttribute("userVo", userVo);
+		view.getModelMap().addAttribute("wishVo", wishVo);
 		view.setViewName("rainbow/wishlist");
         
         return view;

src/main/java/com/qiankun/dao/ActivityDao.java

 package com.qiankun.dao;
 
-import java.util.Date;
 import java.util.List;
 
 import com.qiankun.dao.core.Hints;
@@ -13,6 +12,5 @@ public interface ActivityDao extends IDao<Activity, String> {
 	IPageList<Activity> findActivityPage(String searchStr, String type, String order, String sort,
 			Hints hints);
 
-
-    List<Activity> findByAvailableAndType(String type);
+	List<Activity> findByAvailableAndType(Boolean available, String type);
 }

src/main/java/com/qiankun/dao/ActivityDaoImpl.java

@@ -17,6 +17,8 @@ public class ActivityDaoImpl extends AbsDao<Activity, String> implements Activit
 	
 	private static final String FIND_ACTIVITY_PAGE = " from Activity where name like ?  ";
 	
+	private static final String FIND_ACTIVITY_BY_TYPE = " from Activity where type = ?  ";
+	
 	
 	@Override
 	public IPageList<Activity> findActivityPage(String searchStr, String type, String order, String sort, Hints hints) {
@@ -48,8 +50,14 @@ public class ActivityDaoImpl extends AbsDao<Activity, String> implements Activit
 	}
 
     @Override
-    public List<Activity> findByAvailableAndType(String type) {
-	    boolean available = true;
-        return find("from Activity where type = ? and available = ? order by createTime desc",new Hints(),type,available);
+    public List<Activity> findByAvailableAndType(Boolean available,String type) {
+
+    	String hql = "";
+    	if (available != null) {
+    		hql += " and available = " + available;
+    	}
+    	hql += " order by createTime desc ";
+    		
+        return find(FIND_ACTIVITY_BY_TYPE + hql, new Hints(), type);
     }
 }

src/main/java/com/qiankun/dao/UserDaoImpl.java

@@ -73,11 +73,11 @@ public class UserDaoImpl extends AbsDao<User, String> implements UserDao {
 		
 		String hql = "";
 		if (role != null){
-			hql = " and role = '" +role+ "' ";
+			hql +=  " and role = '" +role+ "' ";
 		}
 		
 		if (status != null){
-			hql = " and status = '" +status+ "' ";
+			hql += " and status = '" +status+ "' ";
 		}
 		
 		if (searchStr == null) {

src/main/java/com/qiankun/dao/WishDao.java

@@ -16,4 +16,6 @@ public interface WishDao extends IDao<Wish,String> {
     IPageList<Wish> findAllByAvailableActivity(String activityId,Hints hints);
 
     IPageList<Wish> findByVolunteeId(String id, Hints hints);
+
+	IPageList<Wish> findPages(String searchStr, String activityId, String order, String sort, Hints hints);
 }

src/main/java/com/qiankun/dao/WishDaoImpl.java

 package com.qiankun.dao;
 
+import org.apache.commons.lang.StringUtils;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.qiankun.dao.core.AbsDao;
 import com.qiankun.dao.core.Hints;
-import com.qiankun.entity.User;
 import com.qiankun.entity.Wish;
 import com.qiankun.pages.IPageList;
 import com.qiankun.pages.PageListImpl;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
 
 @Repository
 public class WishDaoImpl extends AbsDao<Wish,String> implements WishDao {
+	
+	private static final String FIND = " from Wish";
     private static final String FIND_BY_RAINBOWPLANUSERID_SQL = " from Wish where rainbowPlanUserId = ? and activityId = ? order by createTime desc";
     private static final String FIND_BY_AVAILABLE_ACTIVITY_SQL = " from Wish where activityId = ? order by status asc,createTime desc";
     private static final String FIND_BY_VOLUNTEE_ID = " from Wish where volunteerId = ? order by createTime desc";
@@ -24,6 +25,41 @@ public class WishDaoImpl extends AbsDao<Wish,String> implements WishDao {
         return wishPageList;
     }
 
+    
+    
+    @Override
+    public IPageList<Wish> findPages(String searchStr, String activityId, String order, String sort, Hints hints) {
+    	
+    	String hql = "";
+    	if (StringUtils.isNotBlank(searchStr)) {
+    		if (StringUtils.isBlank(hql)) {
+    			hql += " where ";
+    		} else {
+    			hql += " and ";
+    		}
+    		String param = "%" + searchStr + "%";
+    		
+    		hql += " children.phone like '"+param+"' or volunteer.phone like '"+param+"' or children.name like '"+param+"' or volunteer.name like '"+param+"' ";
+    	}
+    	
+    	if (StringUtils.isNotBlank(activityId)) {
+    		if (StringUtils.isBlank(hql)) {
+    			hql += " where ";
+    		} else {
+    			hql += " and ";
+    		}
+    		
+    		
+    		hql += " activity.id= '"+ activityId +"'";
+    		
+    	}
+    	
+        IPageList<Wish> wishPageList = new PageListImpl<Wish>();
+        wishPageList.setRecords(find(FIND + hql + sortHQL(order, sort),hints));
+        wishPageList.setRecordTotal(findCount(" select count(*) "+ FIND + hql));
+        return wishPageList;
+    }
+    
     @Override
     public IPageList<Wish> findAllByAvailableActivity(String activityId,Hints hints) {
         IPageList<Wish> wishPageList = new PageListImpl<Wish>();

src/main/java/com/qiankun/entity/Wish.java

 package com.qiankun.entity;
 
-import org.hibernate.annotations.GenericGenerator;
+import java.util.Date;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import java.util.Date;
+import javax.persistence.ManyToOne;
+
+import org.hibernate.annotations.GenericGenerator;
 
 @Entity
 public class Wish {
@@ -26,9 +28,18 @@ public class Wish {
     private int status;//愿望状态,0:发布;1:领取;2.寄送中;3:红会代收;4:完成
     private String volunteerId; //领取愿望的爱心人士ID
     private String rainbowPlanUserId; //小朋友ID
+    @ManyToOne
+	private RainbowPlanUser children = new RainbowPlanUser();
+    
+    @ManyToOne
+	private RainbowPlanUser volunteer = new RainbowPlanUser();
+    
+    @ManyToOne
+	private Activity activity = new Activity();
+    
     private Date createTime = new Date();
     private String activityId;//彩虹计划活动ID
-    private int helpType;//1:自送礼物;2:快递
+    private int helpType;//0:无 1:自送礼物;2:快递
     private String expressCompany;//快递公司
     private String expressCode;//快递单号
 
@@ -127,4 +138,32 @@ public class Wish {
     public void setExpressCode(String expressCode) {
         this.expressCode = expressCode;
     }
+
+	public RainbowPlanUser getChildren() {
+		return children;
+	}
+
+	public void setChildren(RainbowPlanUser children) {
+		this.children = children;
+	}
+
+	public RainbowPlanUser getVolunteer() {
+		return volunteer;
+	}
+
+	public void setVolunteer(RainbowPlanUser volunteer) {
+		this.volunteer = volunteer;
+	}
+
+	public Activity getActivity() {
+		return activity;
+	}
+
+	public void setActivity(Activity activity) {
+		this.activity = activity;
+	}
+
+	
+    
+    
 }

src/main/java/com/qiankun/service/ActivityService.java

@@ -43,9 +43,14 @@ public class ActivityService {
 		return activitys;
 	}
 
-
+	 public List<Activity> findByAavailableAndType(Boolean available, String type) {
+        List<Activity> activities = activityDao.findByAvailableAndType(available,type);
+        return activities;
+	}
+	 
+	 
     public Activity findByAavailableAndType(String type) {
-        List<Activity> activities = activityDao.findByAvailableAndType(type);
+        List<Activity> activities = activityDao.findByAvailableAndType(true,type);
         if (!CollectionUtils.isEmpty(activities)){
             return activities.get(0);
         }

src/main/java/com/qiankun/vo/WishVo.java

+package com.qiankun.vo;
+
+import java.util.Date;
+
+import com.qiankun.entity.RainbowPlanUser;
+
+public class WishVo {
+    
+    private String id; //愿望ID
+    private String title;//愿望标题
+    private String content;//愿望内容
+    private String uploadImage; //上传的图片
+    private int status;//愿望状态,0:发布;1:领取;2.寄送中;3:红会代收;4:完成
+    private String volunteerId; //领取愿望的爱心人士ID
+    private String rainbowPlanUserId; //小朋友ID
+    private Date createTime = new Date();
+    private String activityId;//彩虹计划活动ID
+    private int helpType;//1:自送礼物;2:快递
+    private String expressCompany;//快递公司
+    private String expressCode;//快递单号
+    
+    private RainbowPlanUser user;  //小朋友信息
+    private RainbowPlanUser volunteer; //爱心人士信息
+    
+    private String searchStr;
+    private String order;
+    private String sort;
+    
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getRainbowPlanUserId() {
+        return rainbowPlanUserId;
+    }
+
+    public void setRainbowPlanUserId(String rainbowPlanUserId) {
+        this.rainbowPlanUserId = rainbowPlanUserId;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getUploadImage() {
+        return uploadImage;
+    }
+
+    public void setUploadImage(String uploadImage) {
+        this.uploadImage = uploadImage;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getVolunteerId() {
+        return volunteerId;
+    }
+
+    public void setVolunteerId(String volunteerId) {
+        this.volunteerId = volunteerId;
+    }
+
+    public String getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(String activityId) {
+        this.activityId = activityId;
+    }
+
+    public int getHelpType() {
+        return helpType;
+    }
+
+    public void setHelpType(int helpType) {
+        this.helpType = helpType;
+    }
+
+    public String getExpressCompany() {
+        return expressCompany;
+    }
+
+    public void setExpressCompany(String expressCompany) {
+        this.expressCompany = expressCompany;
+    }
+
+    public String getExpressCode() {
+        return expressCode;
+    }
+
+    public void setExpressCode(String expressCode) {
+        this.expressCode = expressCode;
+    }
+
+	public RainbowPlanUser getUser() {
+		return user;
+	}
+
+	public void setUser(RainbowPlanUser user) {
+		this.user = user;
+	}
+
+	public RainbowPlanUser getVolunteer() {
+		return volunteer;
+	}
+
+	public void setVolunteer(RainbowPlanUser volunteer) {
+		this.volunteer = volunteer;
+	}
+
+	public String getSearchStr() {
+		return searchStr;
+	}
+
+	public void setSearchStr(String searchStr) {
+		this.searchStr = searchStr;
+	}
+
+	public String getOrder() {
+		return order;
+	}
+
+	public void setOrder(String order) {
+		this.order = order;
+	}
+
+	public String getSort() {
+		return sort;
+	}
+
+	public void setSort(String sort) {
+		this.sort = sort;
+	}
+    
+    
+    
+    
+}

src/main/webapp/WEB-INF/decorators/main.jsp

@@ -211,7 +211,7 @@
 								
 
 								<li>
-									<a href="buttons.html">
+									<a href="<webpath:path/>/rainbow/wish/list">
 										<i class="icon-double-angle-right"></i>
 										愿望管理
 									</a>
@@ -253,7 +253,7 @@
 								<!-- <b class="arrow icon-angle-down"></b> -->
 							</a>
 
-							<ul class="submenu">
+							<%-- <ul class="submenu">
 								<li>
 									<a href="<webpath:path/>/activity/list">
 										<i class="icon-double-angle-right"></i>
@@ -269,7 +269,7 @@
 								</li>
 
 								
-							</ul>
+							</ul> --%>
 						</li>
 
 						<li>

src/main/webapp/WEB-INF/pages/rainbow/userlist.jsp

@@ -55,8 +55,8 @@
 									<th width="7%">疾病</th>
 									<th width="6%">收件人</th>
 									<th width="6%">联系方式</th>
-									<th width="20%">收件地址</th>
-									<th width="10%">注册时间</th>
+									<th width="22%">收件地址</th>
+									<th width="8%">注册时间</th>
 									<th width="5%">操作</th>
 								</tr>
 							</thead>
@@ -80,7 +80,7 @@
 									<td title="">${user.receiveName}</td>
 									<td title="">${user.connectTel}</td>
 									<td title="">${user.receiveAddress}</td>
-									<td title="">${user.createTime}</td>
+									<td title=""><fmt:formatDate value='${user.createTime}' pattern='yyyy-MM-dd HH:mm' /></td>
 									<td>
 										<div class="visible-md visible-lg hidden-sm hidden-xs btn-group">
 		

src/main/webapp/WEB-INF/pages/rainbow/wishlist.jsp

+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+
+<%@ taglib prefix="webpath" uri="/WEB-INF/tlds/path.tld" %>
+<%@ taglib prefix="webpage" uri="/WEB-INF/tlds/pageview.tld" %>
+
+<head>
+	
+
+</head>
+		
+
+<div class="main-content">
+	<div class="breadcrumbs" id="breadcrumbs">
+		
+
+		<ul class="breadcrumb">
+			<li>
+				<i class="icon-home home-icon"></i>
+				<a href="#">首页</a>
+			</li>
+			<li class="active">彩虹计划</li>
+			<li class="active">愿望管理</li>
+			
+		</ul><!-- .breadcrumb -->
+
+		
+	</div>
+	<div class="page-content">
+		<div class="row">
+			<div class="col-xs-12">
+				<div class="pull-right">
+					<select class="" id="activityId" name="nativePlace">
+						<option value="">请选择</option>
+						<c:forEach var="list" items="${activitylist}">
+							<option value="${list.id}" <c:if test="${wishVo.activityId==list.id}">selected</c:if>>${list.name}</option>
+						</c:forEach>
+					</select>
+					<input type="text" placeholder="查询" class="nav-search-input" id="searchStr" value="${wishVo.searchStr}" autocomplete="off">
+					<a href="javascript:void(0);" onclick="wish.search();"><i class="icon-search nav-search-icon"></i></a>
+				</div>
+			
+										
+				<div class="pull-left">共${wishPage.recordTotal}条</div>
+						<table id="table-data" class="table table-bordered ">
+							<thead>
+								<tr class="" >
+									<th class="center" width="2%">
+										<label>
+											<input type="checkbox" class="ace">
+											<span class="lbl"></span>
+										</label>
+									</th>
+									<th width="5%">图片</th>
+									<th width="">小朋友</th>
+									<th width="">愿望</th>
+									<th width="">内容</th>
+									<th width="">爱心人士</th>
+									<th width="">寄送方式</th>
+									<th width="">快递公司</th>
+									<th width="">快递单号</th>
+									<th width="">所属活动</th>
+									<th width="">状态</th>
+									<th width="">发布时间</th>
+									<th width="5%">操作</th>
+								</tr>
+							</thead>
+				
+							<tbody>
+								<c:forEach var="wish" items="${wishPage.records}">
+									<tr class="tr-highlight">
+										<td class="center" width=10>
+											<label>
+												<input type="checkbox" class="ace" value="${wish.id}">
+												<span class="lbl"></span>
+											</label>
+										</td>
+										<td title="" valign="middle"></td>
+										<td title="">${wish.children.name}<br/>
+										手机：${wish.children.phone}
+										</td>
+										<td title="" valign="middle">${wish.title}</td>
+										<td title="" valign="middle">${wish.content}</td>
+										<td title="" valign="middle">${wish.volunteer.name}<br/>
+										手机：${wish.volunteer.phone}</td>
+										<td title="" valign="middle"><c:if test="${wish.helpType == 1}">自送</c:if><c:if test="${wish.helpType == 1}">快递</c:if></td>
+										<td title="" valign="middle">${wish.expressCompany}</td>
+										<td title="" valign="middle">${wish.expressCode}</td>
+										<td title="" valign="middle">${wish.activity.name}</td>
+										<td title="" valign="middle">
+										<c:if test="${wish.status == 0}"><span class="label label-warning">发布</span></c:if>
+										<c:if test="${wish.status == 1}"><span class="label label-info">领取</span></c:if>
+										<c:if test="${wish.status == 2}"><span class="label label-purple">寄送中</span></c:if>
+										<c:if test="${wish.status == 3}"><span class="label label-pink">红会代收</span></c:if>
+										<c:if test="${wish.status == 4}"><span class="label label-success">完成</span></c:if>
+										</td>
+										
+	
+										<td title="" valign="middle"><fmt:formatDate value='${wish.createTime}' pattern='yyyy-MM-dd HH:mm' /></td>
+										<td>
+											<div class="visible-md visible-lg hidden-sm hidden-xs btn-group">
+			
+												<%-- <button class="btn btn-xs btn-info" onclick="window.location.href='<webpath:path/>/rainbow/user/add?id=${user.id}'">
+													<i class="icon-credit-card bigger-120"></i>
+												</button>
+												&nbsp; --%>
+					
+												<!-- <button class="btn btn-xs btn-danger">
+													<i class="icon-trash bigger-120"></i>
+												</button> -->
+					
+												
+											</div>
+					
+											
+										</td>
+									</tr>
+								</c:forEach>
+							</tbody>
+						</table>
+					
+					
+												
+					<webpage:page totalCount="${wishPage.recordTotal}"
+					pageCount="${pageCount}" currentPage="${pageNumber}"
+					action="/rainbow/wish/list"
+					className="pageable-div pagination" 
+					innerStyle=" float: left; width: 100%" /> 								
+
+				</div>
+			
+		</div>
+	</div>
+
+</div>
+
+
+<script src="<webpath:path/>/resources/js/rainbow/wish.js" type="text/javascript"></script>
\ No newline at end of file

src/main/webapp/WEB-INF/pages/user/userlist.jsp

@@ -130,7 +130,7 @@
                             	普通用户
                             </c:if>
 							</td>
-							<td title="<fmt:formatDate value='${user.createTime}' pattern='yyyy-MM-dd HH:mm:ss' />"><fmt:formatDate value='${user.createTime}' pattern='yyyy-MM-dd HH:mm:ss' /> </td>
+							<td title="<fmt:formatDate value='${user.createTime}' pattern='yyyy-MM-dd HH:mm' />"><fmt:formatDate value='${user.createTime}' pattern='yyyy-MM-dd HH:mm' /> </td>
 		
 							<td>
 							 	<c:if test="${user.status==1 || user.status==null}">

src/main/webapp/resources/js/rainbow/wish.js

+$(document).ready(function(){
+	$("#activityId").select2({
+		placeholder : "请选择",
+		allowClear : true
+	});
+	
+})
+
+
+var wish = {
+	
+	search : function(url){
+		var activityId = $("#activityId").val();
+		var searchStr = $("#searchStr").val();
+		var url = webPath + "/rainbow/wish/list";
+		
+		if(activityId!="" || searchStr!=""){
+			var param = "?"
+			if (activityId != ""){
+				param = param + "activityId=" + activityId ;
+			}
+			
+			if (searchStr != ""){
+				if (param == "?"){
+					param = param + "searchStr=" + searchStr;
+				} else {
+					param = param + "&searchStr=" + searchStr;
+				}
+				
+			}
+			url = url + param;
+		}
+		window.location.href = url;
+	}
+	
+	
+}
\ No newline at end of file