Merge branch 'f-6.7.0' of 192.168.10.6:caosy/fun-golf-service into f-6.7.0

src/main/java/com/ctrip/fun/golf/api/adminUser/AdminUserController.java

@@ -214,4 +214,16 @@ public class AdminUserController extends GenericController<AdminUserService, Adm
         return response;
     }
 	
+	@ResponseBody
+    @RequestMapping(value = "/deleteAdminRole", method = RequestMethod.POST)
+    @Log(parentLog=true,action="新增")
+    public Response<Serializable> deleteAdminRole(@RequestBody Request<Integer> request) {
+        Serializable id = adminRoleService.deleteAdminRole(request.getBody());
+        Response<Serializable> response = new Response<Serializable>();
+        response.setStatus(ResponseStatusEnum.SUCCESS.getValue());
+        response.setMessage(ResponseStatusEnum.SUCCESS.getMsg());
+        response.setBody(id);
+        return response;
+    }
+
 }

src/main/java/com/ctrip/fun/golf/api/user/CommuneAdmController.java

@@ -7,10 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-
-
-
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
@@ -21,6 +17,7 @@ import com.ctrip.fun.common.vo.ResponseStatusEnum;
 import com.ctrip.fun.common.vo.user.CommuneAdmBean;
 import com.ctrip.fun.common.vo.user.CommuneAdmQuery;
 import com.ctrip.fun.common.vo.user.CommuneLabelBean;
+import com.ctrip.fun.common.vo.user.CommuneNumberBean;
 import com.ctrip.fun.golf.service.user.CommuneAdmService;
 
 @Controller
@@ -198,4 +195,20 @@ public class CommuneAdmController {
     	return response;
     }
     
+    /**
+     * 查找所有销售绑定数量
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/findBindNum", method = RequestMethod.POST)
+    public Response<PagedResponseBean<CommuneNumberBean>> findBindNum(@RequestBody Request<CommuneAdmQuery> request) {
+    	PagedResponseBean<CommuneNumberBean> admBean = communeAdmService.findBindNum(request);
+    	Response<PagedResponseBean<CommuneNumberBean>> response = new Response<PagedResponseBean<CommuneNumberBean>>();
+    	response.setBody(admBean);
+        response.setStatusEnum(ResponseStatusEnum.SUCCESS);
+        response.setMessage(ResponseStatusEnum.SUCCESS.getMsg());
+    	return response;
+    }
+
 }

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

@@ -10,11 +10,15 @@ import java.util.Map;
 import org.apache.commons.lang.StringUtils;
 import org.hibernate.Query;
 import org.hibernate.criterion.CriteriaSpecification;
+import org.hibernate.transform.Transformers;
 
 import com.ctrip.fun.common.core.util.BeanConverter;
 import com.ctrip.fun.common.core.util.DateUtil;
+import com.ctrip.fun.common.vo.PagedResponseBean;
+import com.ctrip.fun.common.vo.Request;
 import com.ctrip.fun.common.vo.user.CommuneAdmBean;
 import com.ctrip.fun.common.vo.user.CommuneAdmQuery;
+import com.ctrip.fun.common.vo.user.CommuneNumberBean;
 import com.ctrip.fun.golf.dao.GenericHibernateDao;
 import com.ctrip.fun.golf.domain.user.CommuneAdm;
 import com.ctrip.fun.golf.vo.PagedEntityBean;
@@ -222,4 +226,29 @@ public class CommuneAdmDao extends GenericHibernateDao<CommuneAdm, Integer> {
 
 	}
 
+	public PagedResponseBean<CommuneNumberBean> findBindNum(Request<CommuneAdmQuery> request) {
+		  String bindStatus = "uca.admUserId";
+		  if(request.getBody().getBindStatus() == 0){
+			  bindStatus = "uca.admUserId";
+		  }else{
+			  bindStatus = "uca.admUserId2";
+		  }
+		
+		  String sql = "SELECT "+bindStatus+" admUserId,au.nickName admUserNickName,au.username admUserName,CASE au.`enable` WHEN '0' THEN '离职' WHEN '1' THEN '在职' END admUserStatus,count(1) userNumber FROM usr_commune_adm uca LEFT JOIN adm_users au ON "+bindStatus+" = au.id WHERE "+bindStatus+" IS NOT NULL GROUP BY "+bindStatus+" ORDER BY au.`enable`";
+		  PagedResponseBean<CommuneNumberBean> response = new PagedResponseBean<CommuneNumberBean>();
+		  Query  queryObject = getSession().createSQLQuery(sql);
+		  
+		  Query setResultTransformer = queryObject.setResultTransformer(Transformers.aliasToBean(CommuneNumberBean.class));
+		  queryObject.setFirstResult(request.getBody().getPagerOffset());//页码s
+          queryObject.setMaxResults(request.getBody().getPagerPerPage());//页面大小
+		  List<CommuneNumberBean> list = setResultTransformer.list();
+		  response.setResult(list);
+		  // 查询数据总数
+		  String countSql = "select count(*) from(SELECT count(1) FROM usr_commune_adm uca LEFT JOIN adm_users au ON "+bindStatus+" = au.id WHERE "+bindStatus+" IS NOT NULL GROUP BY "+bindStatus+" ORDER BY au.`enable`) a";
+		  Query  queryCount = getSession().createSQLQuery(countSql);
+		  BigInteger count = (BigInteger)queryCount.uniqueResult();
+		  response.setCount(count.intValue());
+		return response;
+	}
+
 }

src/main/java/com/ctrip/fun/golf/service/adminUser/AdminRoleService.java

@@ -3,6 +3,7 @@
  */
 package com.ctrip.fun.golf.service.adminUser;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -126,4 +127,11 @@ public class AdminRoleService extends  GenericService<AdminRoleDao, AdminRole, I
     		}
     	}
 	}
+
+
+	public Serializable deleteAdminRole(Integer id) {
+		adminRoleDao.delete(id);	
+    	adminResourcesDao.deleteRoleRes(id);
+		return null;
+	}
 }

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

@@ -9,6 +9,7 @@ import java.util.Map;
 import com.ctrip.fun.common.core.util.BeanConverter;
 import com.ctrip.fun.common.core.util.DateUtil;
 import com.ctrip.fun.common.vo.PagedResponseBean;
+import com.ctrip.fun.common.vo.Request;
 import com.ctrip.fun.common.vo.user.CommuneAdmBean;
 import com.ctrip.fun.common.vo.user.CommuneLabelBean;
 import com.ctrip.fun.golf.dao.user.CommuneAdmDao;
@@ -18,6 +19,7 @@ import com.ctrip.fun.golf.domain.user.CommuneLabel;
 import com.ctrip.fun.golf.vo.PagedEntityBean;
 import com.ctrip.fun.common.vo.user.CommuneAdmQuery;
 import com.ctrip.fun.common.vo.user.CheckedRegionEnum;
+import com.ctrip.fun.common.vo.user.CommuneNumberBean;
 import com.ctrip.fun.common.vo.user.CustomerRegionEnum;
 
 
@@ -185,6 +187,13 @@ public class CommuneAdmService {
 		this.communeLabelDao = communeLabelDao;
 	}
 
+	public PagedResponseBean<CommuneNumberBean> findBindNum(Request<CommuneAdmQuery> request) {
+		
+		PagedResponseBean<CommuneNumberBean> list = communeAdmDao.findBindNum(request);
+		
+		return list;
+	}
+