业务提交数据查询优化

src/main/java/com/ctrip/fun/golf/dao/user/ActiveCustomerDao.java

@@ -20,6 +20,7 @@ import com.ctrip.fun.common.core.util.StringUtils;
 import com.ctrip.fun.common.vo.PagedResponseBean;
 import com.ctrip.fun.common.vo.adminUser.AdminUserBean;
 import com.ctrip.fun.common.vo.basic.VipGradeEnum;
+import com.ctrip.fun.common.vo.user.ActiveCustomerAuditStatusEnum;
 import com.ctrip.fun.common.vo.user.ActiveCustomerBean;
 import com.ctrip.fun.common.vo.user.ActiveCustomerQuery;
 import com.ctrip.fun.common.vo.user.CommuneAdmBean;
@@ -77,7 +78,19 @@ public class ActiveCustomerDao extends GenericHibernateDao<ActiveCustomer, Integ
         	sql.append(" AND a.auditUser LIKE '%"+query.getAuditUser()+"%'");
         }
         if (query.getAuditState()!=null &&query.getAuditState()!= 0 ) {
-        	sql.append(" AND a.auditState = "+query.getAuditState()+"");
+        	switch(query.getAuditState()){
+        	case 1 :	//未审批
+        		sql.append(" AND a.auditState = "+ query.getAuditState());
+        		break;
+        	case -2:	//未确认
+        		sql.append(" AND a.auditState&2 != 2");
+        		break;
+        	case -4:	//未录入公社
+        		sql.append(" AND a.auditState&4 != 4");
+        		break;
+        	default:
+        		sql.append(" AND a.auditState & "+query.getAuditState()+" = "+query.getAuditState()+" ");
+        	}
         }
 
 		sql.append(" order by a.createTime desc");

src/main/java/com/ctrip/fun/golf/service/user/ActiveCustomerService.java

@@ -52,15 +52,15 @@ public class ActiveCustomerService  extends GenericService<ActiveCustomerDao, Ac
 		Response<Object> response = new Response<Object>();
 		//TODO: 验证社员证编号是否存在
 
+		ActiveCustomer activeCustomer  = activeCustomerDao.findById(param.getId());
 		
-		//加入公社, 将数据写入到usr_communeExt表中
-		int rlt = activeCustomerDao.updateAuditState(param);
-        response.setStatus(ResponseStatusEnum.SUCCESS.getValue());
-        response.setMessage("操作成功!");
-        response.setBody(rlt);
+		//录入公社
 		if(param.getAuditState()==ActiveCustomerAuditStatusEnum.ADDED.getValue()){
+			//更改状态
+			param.setAuditState(param.getAuditState()|activeCustomer.getAuditState());
+			activeCustomerDao.updateAuditState(param);
+			
 			//如果已经写入,直接执行更新, 返回已经录入成功
-			ActiveCustomer activeCustomer  = activeCustomerDao.findById(param.getId());
 			CommuneExtQuery extQuery = new CommuneExtQuery();
 			extQuery.setMobilePhone(activeCustomer.getCustomerMobile());
 			CommuneExt existed = communeExtDao.getByPhone(extQuery);
@@ -88,6 +88,14 @@ public class ActiveCustomerService  extends GenericService<ActiveCustomerDao, Ac
 		        response.setMessage("录入成功,该社员信息需要完善,立刻前往!");
 		        response.setBody(id);
 			}
+		}else{  //非录入公社统一处理
+			//更改状态
+			param.setAuditState(param.getAuditState()|activeCustomer.getAuditState());
+			//加入公社, 将数据写入到usr_communeExt表中
+			int rlt = activeCustomerDao.updateAuditState(param);
+	        response.setStatus(ResponseStatusEnum.SUCCESS.getValue());
+	        response.setMessage("操作成功!");
+	        response.setBody(rlt);
 		}
 		
 		return response;