no message

pom.xml

@@ -246,6 +246,12 @@
 		<artifactId>core</artifactId>
 		<version>3.3.0</version>
 	</dependency>
+	
+	<dependency>
+		<groupId>log4j</groupId>
+		<artifactId>log4j</artifactId>
+		<version>1.2.16</version>
+	</dependency>
 		
     <dependency>
 			<groupId>net.sourceforge.jexcelapi</groupId>

src/main/java/com/qiankun/controller/ActivityController.java

@@ -153,7 +153,7 @@ public class ActivityController extends BaseController<Object>{
 	    	activity.setMax(activityVo.getMax());
 	    	activity.setName(activityVo.getName());
 	    	activity.setTel(activityVo.getTel());
-	    	//activity.setType(activityVo.getType());
+	    	activity.setType(activityVo.getType());
 	    	
 	    	Activity a = activityService.save(activity);
 	    	

src/main/java/com/qiankun/controller/UserController.java

@@ -151,7 +151,6 @@ public class UserController extends BaseController<Object>{
         	}
         	
 			user.setCreateTime(date);
-			user.setStatus("0");
 			map.put("status", 1);
         } else {
 
@@ -208,6 +207,7 @@ public class UserController extends BaseController<Object>{
     	user.setWeight(userVo.getWeight());
     	user.setRemark(userVo.getRemark());
     	user.setRole(userVo.getRole());
+    	user.setStatus(userVo.getStatus());
     	
     	Contacts contacts1 = new Contacts();
     	contacts1.setName(userVo.getContactsName1());
@@ -282,7 +282,7 @@ public class UserController extends BaseController<Object>{
     @RequestMapping("/user/list")
     public ModelAndView userList(UserVo userVo, HttpServletResponse response, HttpServletRequest request) throws Exception {
         ModelAndView view = new ModelAndView();
-        IPageList<User> userPage = userService.findByUsers(userVo.getSearchStr(), userVo.getRole(), userVo.getOrder(), userVo.getSort(), 
+        IPageList<User> userPage = userService.findByUsers(userVo.getSearchStr(), userVo.getRole(), userVo.getStatus(), userVo.getOrder(), userVo.getSort(), 
 					new Hints(getStartRow(request), getPageCount(request)));
 			
 		view.getModelMap().addAttribute("userPage", userPage);

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

@@ -9,7 +9,7 @@ public interface UserDao extends IDao<User, String> {
 
     User findByPaperId(String paperId, String paperType);
 
-    IPageList<User> findUserPage(String searchStr, String role, String order, String sort, Hints hints);
+    IPageList<User> findUserPage(String searchStr, String role, String status, String order, String sort, Hints hints);
 
 	User login(String userName, String password);
 

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

 package com.qiankun.dao;
 
-import java.util.List;
-
 import org.springframework.stereotype.Repository;
 
 import com.qiankun.dao.core.AbsDao;
@@ -62,7 +60,7 @@ public class UserDaoImpl extends AbsDao<User, String> implements UserDao {
 	
 	
 	@Override
-	public IPageList<User> findUserPage(String searchStr, String role, String order, String sort, Hints hints) {
+	public IPageList<User> findUserPage(String searchStr, String role, String status,String order, String sort, Hints hints) {
 		
 		if (order == null){
 			order = " createTime ";
@@ -71,9 +69,13 @@ public class UserDaoImpl extends AbsDao<User, String> implements UserDao {
 			sort=" desc ";
 		}
 		
-		String groupHql = null;
+		String hql = "";
 		if (role != null){
-			groupHql = " and groups = ? ";
+			hql = " and role = '" +role+ "' ";
+		}
+		
+		if (status != null){
+			hql = " and status = '" +status+ "' ";
 		}
 		
 		if (searchStr == null) {
@@ -81,13 +83,9 @@ public class UserDaoImpl extends AbsDao<User, String> implements UserDao {
 		}
 		String param = "%" + searchStr + "%";
 		IPageList<User> users = new PageListImpl<User>();
-		if (role != null){
-			users.setRecords(find(FIND_USER_PAGE + groupHql + sortHQL(order, sort), hints, param, param, param, param, role));
-			users.setRecordTotal(findCount(" select count(*) " + FIND_USER_PAGE + groupHql, param, param, param, param, role));
-		} else {
-			users.setRecords(find(FIND_USER_PAGE + sortHQL(order, sort), hints, param, param, param, param));
-			users.setRecordTotal(findCount(" select count(*) " + FIND_USER_PAGE, param, param, param, param));
-		}
+		users.setRecords(find(FIND_USER_PAGE + hql + sortHQL(order, sort), hints, param, param, param, param));
+		users.setRecordTotal(findCount(" select count(*) " + FIND_USER_PAGE + hql, param, param, param, param));
+		
 		
 		return users;
 	}	

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

@@ -68,7 +68,8 @@ public class User {
     private String pwd;           //密码
     
     private String role;    	  //角色     1.管理员   2.志愿者  
-    private String status;		//状态    0.未采血    1.已采血   2退库   3 再次采血
+    private String status;		//状态    1.未采血    2.已采血   3退库   4 再次采血
+    private boolean login = false;     //是否可以登后台;
     
     private Date createTime = new Date();
     private Date updateTime = new Date();
@@ -345,6 +346,12 @@ public class User {
 	public void setReferrals(String referrals) {
 		this.referrals = referrals;
 	}
+	public boolean isLogin() {
+		return login;
+	}
+	public void setLogin(boolean login) {
+		this.login = login;
+	}
 
 
     

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

@@ -37,8 +37,8 @@ public class UserService {
 	}
 
 	
-	public IPageList<User> findByUsers(String searchStr,String groupId,String order,String sort, Hints hints){
-		IPageList<User> users = userDao.findUserPage(searchStr, groupId, order, sort, hints);
+	public IPageList<User> findByUsers(String searchStr,String role, String status, String order,String sort, Hints hints){
+		IPageList<User> users = userDao.findUserPage(searchStr, role, status, order, sort, hints);
 		return users;
 	}
 	

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

@@ -53,6 +53,20 @@
 						  
 						</div>
 					</div>
+					
+					<div class="form-group">
+						<label class="col-sm-3 control-label no-padding-right" for="form-field-1">  状态 </label>
+
+						<div class="col-sm-9">
+							<select class="col-xs-10 col-sm-10" id="status" name="status">
+									<option value="1" <c:if test="${user.status==1}">selected</c:if>>未采血</option>
+									<option value="2" <c:if test="${user.status==2}">selected</c:if>>已采血</option>
+									<option value="1" <c:if test="${user.status==3}">selected</c:if>>已退库</option>
+									<option value="2" <c:if test="${user.status==4}">selected</c:if>>再采血</option>
+							</select>
+						  
+						</div>
+					</div>
 				
 					<div class="form-group">
 						<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> <font color="red">*</font> 姓名 </label>

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

@@ -50,13 +50,28 @@
 					
 				</div>
 				
-				<div class="nav-search" id="nav-search">
-					<form class="form-search">
-						<span class="input-icon">
-							<input type="text" placeholder="查询" class="nav-search-input" id="searchStr" autocomplete="off">
-							<i class="icon-search nav-search-icon"></i>
-						</span>
-					</form>
+				<div class="pull-right">
+					
+					
+							<select class="" id="role" name="role">
+									<option value="">请选择</option>
+									<option value="2" <c:if test="${userVo.role==2}">selected</c:if>>普通用户</option>
+									<option value="1" <c:if test="${userVo.role==1}">selected</c:if>>管理员</option>
+							</select>
+						  
+						
+							<select class="" id="status" name="status">
+									<option value="">请选择</option>
+									<option value="1" <c:if test="${userVo.status==1}">selected</c:if>>未采血</option>
+									<option value="2" <c:if test="${userVo.status==2}">selected</c:if>>已采血</option>
+									<option value="3" <c:if test="${userVo.status==3}">selected</c:if>>已退库</option>
+									<option value="4" <c:if test="${userVo.status==4}">selected</c:if>>再采血</option>
+							</select>
+						
+							<input type="text" placeholder="查询" class="nav-search-input" id="searchStr" value="${userVo.searchStr}" autocomplete="off">
+							<a href="javascript:void(0);" id="searchBtn"><i class="icon-search nav-search-icon"></i></a>
+						
+						
 				</div>
 			</div>
 			
@@ -118,12 +133,20 @@
 							<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>
-							 	<c:if test="${user.status==0 || user.status==null}">
+							 	<c:if test="${user.status==1 || user.status==null}">
 								<span class="label label-sm label-warning">未采血</span>
 								</c:if>
-								 <c:if test="${user.status==1}">
+								<c:if test="${user.status==2}">
 								<span class="label label-sm label-success">已采血</span>
 								</c:if>
+								
+								<c:if test="${user.status==3}">
+								<span class="label label-sm label-danger">已退库</span>
+								</c:if>
+								
+								<c:if test="${user.status==4}">
+								<span class="label label-sm label-primary">再采血</span>
+								</c:if>
 							</td>
 		
 							<td>
@@ -174,4 +197,4 @@
 	
 	
 </div>
-
+<script src="<webpath:path/>/resources/js/user/user.js" type="text/javascript"></script>

src/main/webapp/resources/js/user/user.js

 var isSubmit = true;
 $(document).ready(function(){
+	$("#searchBtn").bind("click",function(){
+		user.search();
+	});
 	
 	if ($('#userForm').length>0){
 		$('#userForm').validate({
@@ -102,24 +105,26 @@ $(document).ready(function(){
 	        
 		});
 		
+		laydate.render({
+			  elem: '#birthday'
+			});
+		$('#birthday').datepicker()
+		
+		$("#nation").select2({
+			placeholder : "请选择",
+			allowClear : true
+		});
+		
+		$("#nativePlace").select2({
+			placeholder : "请选择",
+			allowClear : true
+		});
+
+		
 	}
 	
 
-	laydate.render({
-		  elem: '#birthday'
-		});
-	$('#birthday').datepicker()
 	
-	$("#nation").select2({
-		placeholder : "请选择",
-		allowClear : true
-	});
-	
-	$("#nativePlace").select2({
-		placeholder : "请选择",
-		allowClear : true
-	});
-
 	
 /*	$("#domicilePlace").hsCheckData({
         isShowCheckBox: false, //默认为false
@@ -143,6 +148,7 @@ var user = {
 				  data: {
 					  id:$('#id').val(),
 					  role:$('#role').val(),
+					  status:$('#status').val(),
 					  userName:$('#mobile').val(),
 					  name:$('#name').val(),
 					  gender:$('input:radio[name="gender"]:checked').val(),
@@ -259,6 +265,39 @@ var user = {
 			
 		}
 		
+	},
+	search : function(){
+		var role = $("#role").val();
+		var status = $("#status").val();
+		var searchStr = $("#searchStr").val();
+		var url = webPath + "/user/list";
+		
+		if(role!="" || status!="" || searchStr!=""){
+			var param = "?"
+			if (role != ""){
+				param = param + "role=" + role ;
+			}
+			
+			
+			if (status != ""){
+				if (param == "?"){
+					param = param + "status=" + status;
+				} else {
+					param = param + "&status=" + status;
+				}
+				
+			}
+			if (searchStr != ""){
+				if (param == "?"){
+					param = param + "searchStr=" + searchStr;
+				} else {
+					param = param + "&searchStr=" + searchStr;
+				}
+				
+			}
+			url = url + param;
+		}
+		window.location.href = url;
 	}
 	
 }