Merge branch 'branch0730' of

http://192.168.1.195:9998/ZTEITS-Developers/zteits-oa.git into branch0730 Conflicts: src/main/java/com/zteits/oa/report/web/OAuthController.java

Merge branch 'branch0730' of
http://192.168.1.195:9998/ZTEITS-Developers/zteits-oa.git into branch0730 Conflicts: src/main/java/com/zteits/oa/report/web/OAuthController.java
王富生
2 parents 1ab8179c 9bd9248e
Showing 6 changed files with 137 additions and 140 deletions
src/main/java/com/zteits/oa/api/dto/asraop/param/AsraOpQueryReq.java
src/main/java/com/zteits/oa/api/service/report/query/AsraOpRelationsQueryService.java
src/main/java/com/zteits/oa/report/dao/impl/AsraDailyDaoImpl.java
src/main/java/com/zteits/oa/report/web/AsraOpController.java
src/main/java/com/zteits/oa/report/web/OAuthController.java
src/main/resources/mybatis/smapper/AsraOpSmapper.xml
@@ -25,11 +25,34 @@ public class AsraOpQueryReq extends BaseRequest{
     /**员工邮箱*/
     private String email;
-   
+
     /**父级ID 顶级为-1*/
     private Long parentId;
-   
-    
+
+
+
+
+	/**员工idlist*/
+	private List<Long> opIdLists;
+
+	/**员工idlist*/
+	private List<Long> opParentIdLists;
+
+	public List<Long> getOpIdLists() {
+		return opIdLists;
+	}
+
+	public void setOpIdLists(List<Long> opIdLists) {
+		this.opIdLists = opIdLists;
+	}
+
+	public List<Long> getOpParentIdLists() {
+		return opParentIdLists;
+	}
+
+	public void setOpParentIdLists(List<Long> opParentIdLists) {
+		this.opParentIdLists = opParentIdLists;
+	}
 	public Long getParentId() {
 		return parentId;
-package com.zteits.oa.api.service.report.query;
-
-import com.zteits.oa.api.base.bean.BizResult;
-import com.zteits.oa.api.base.bean.PageBean;
-import com.zteits.oa.api.dto.asraop.AsraOpDTO;
-import com.zteits.oa.api.dto.asraop.param.AsraOpQueryReq;
-import com.zteits.oa.api.dto.asraoprelations.AsraOpRelationsDTO;
-import com.zteits.oa.api.dto.asraoprelations.param.AsraOpRelationsQueryReq;
-
-import java.util.List;
-
-/**
- * 员工关系表查询service.<br/>
- * 
- * Copyright: Copyright (c) 2017  ZTE-ITS
- * 
- * @ClassName: AmountUtils.java
- * @Description: 
- * @version: v1.0.0
- * @author: wangfs
- * @date: 2018年7月30日
- * Modification History:
- * Date             Author          Version            Description
- *---------------------------------------------------------*
- * 2018年7月30日      xiejp           v1.0.0               创建
- */
-public interface AsraOpRelationsQueryService {
-
-	/**
-	 * 根据登录工号查询管理的员工信息
-	 * @param
-	 * @return
-	 * @Author: xiejianpeng
-	 * @Date: 2018/7/31 10:33
-	 *
-	 */
-	BizResult<List<AsraOpRelationsDTO>> queryAsraOpRelations(AsraOpRelationsQueryReq asraOpRelationsQueryReq);
-}
@@ -4,11 +4,11 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import com.xiaoleilu.hutool.util.CollectionUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import com.xiaoleilu.hutool.date.DateUtil;
-import com.xiaoleilu.hutool.util.CollectionUtil;
 import com.zteits.oa.api.dto.asradaily.param.AsraDailyForTotalNumAndDetailReq;
 import com.zteits.oa.api.dto.asradaily.param.AsraDailyQueryReq;
 import com.zteits.oa.report.dao.AsraDailyDao;
@@ -69,13 +69,13 @@ public class AsraDailyDaoImpl implements AsraDailyDao{
 	public AsraDailyOpNumForCurrentDayDO queryAsraDailyOpNumForCurrentDay(AsraDailyForTotalNumAndDetailReq request) {
 		AsraDailyOpNumForCurrentDayDO asraDailyOpNumForCurrentDayDO = new AsraDailyOpNumForCurrentDayDO();
 		List<Long> opList = new ArrayList<>();
-		
+
 		//1.总人数获取
 		int employeeTotal = 0;
 		if(CollectionUtil.isNotEmpty(request.getOpIds())){
 			employeeTotal = request.getOpIds().size();
 		}
-		
+
 		//2.查询今日日报填写人数
 		AsraDailyExample exampleTwo = new AsraDailyExample();
 		exampleTwo.createCriteria().andAsarOpIdIn(opList)
 package com.zteits.oa.report.web;
 import com.alibaba.fastjson.JSONObject;
-import com.xiaoleilu.hutool.util.CollectionUtil;
 import com.zteits.oa.api.base.bean.BizResult;
 import com.zteits.oa.api.base.bean.PageBean;
 import com.zteits.oa.api.base.constants.SessionEnum;
 import com.zteits.oa.api.dto.asraop.AsraOpDTO;
 import com.zteits.oa.api.dto.asraop.param.AsraOpQueryReq;
-import com.zteits.oa.api.dto.asraoprelations.AsraOpRelationsDTO;
-import com.zteits.oa.api.dto.asraoprelations.param.AsraOpRelationsQueryReq;
 import com.zteits.oa.api.service.report.query.AsraOpQueryService;
-import com.zteits.oa.api.service.report.query.AsraOpRelationsQueryService;
 import com.zteits.oa.report.web.vo.EasyUIDataGridVO;
 import io.swagger.annotations.Api;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cglib.core.CollectionUtils;
 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.RestController;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import java.util.ArrayList;
-import java.util.List;
 @Api(value = "日报系统-员工管理", description = "日报系统-员工管理")
 @RestController
@@ -38,15 +30,12 @@ public class AsraOpController extends BizController {
 	private AsraOpQueryService asraOpQueryService;
-
-
-	
 	@RequestMapping(value="/queryAsraOpPage",method = RequestMethod.POST)
 	public BizResult<EasyUIDataGridVO<AsraOpDTO>> queryAsraOpPage(@RequestBody AsraOpQueryReq asraOpQueryReq, HttpServletRequest request) throws IllegalAccessException, InstantiationException {
 		logger.info("日报系统-员工管理-根据登录人分页查询员工信息入参:{}", JSONObject.toJSON(asraOpQueryReq));
 		/**1.根据当前登录人查询登录人下面管理的员工-缓存中获取*/
 		AsraOpDTO asraOpDTO = (AsraOpDTO)request.getSession().getAttribute(SessionEnum.USER_INFO.key());
-		asraOpQueryReq.setId(asraOpDTO.getId());
+		asraOpQueryReq.setOpIdLists(asraOpDTO.getOpIds());
 		BizResult<PageBean<AsraOpDTO>>  result = asraOpQueryService.queryAsraOpForPage(asraOpQueryReq);
 		logger.info("日报系统-员工管理-根据登录人分页查询员工信息结果:{}", JSONObject.toJSON(result));
 		return returnJqGridData(result, AsraOpDTO.class);
 package com.zteits.oa.report.web;
-
 import java.util.ArrayList;
 import java.util.List;
@@ -15,10 +14,10 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
 import com.alibaba.fastjson.JSONObject;
 import com.xiaoleilu.hutool.util.CollectionUtil;
 import com.zteits.oa.api.base.bean.BizResult;
+import com.zteits.oa.api.base.bean.PageBean;
 import com.zteits.oa.api.base.constants.ErrorType;
 import com.zteits.oa.api.base.constants.SessionEnum;
 import com.zteits.oa.api.dto.asraop.AsraOpDTO;
@@ -28,7 +27,6 @@ import com.zteits.oa.api.dto.asraop.param.LoginOauthReq;
 import com.zteits.oa.api.service.report.query.AsraOpQueryService;
 import com.zteits.oa.report.vo.OAuthResult;
 import com.zteits.oa.util.MD5Utils;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -94,8 +92,10 @@ public class OAuthController {
 			 List<Long> opIds = new ArrayList<>();
 			 opIds.add(asraOpDTO.getId());
+			 List<Long> opParentIds = new ArrayList<>();
+			 opParentIds.add(asraOpDTO.getId());
 			 /**递归查询员工ids.*/
-			 opIds = queryOpTreeByOpId(asraOpDTO.getId());
+			 opIds = queryOpTreeByOpIds(opParentIds,opIds);
 			 logger.info("---获取到的opIds={}",JSONObject.toJSON(opIds));
 			 asraOpDTO.setOpIds(opIds);
 			 HttpSession session = request.getSession();
@@ -117,7 +117,7 @@ public class OAuthController {
 	 }
 	 /**
 	  * 退出登录
-	  * @param req
+	  * @param
 	  * @return
 	  * 2018年7月31日  wangfs.<br/>
 	  */
@@ -135,9 +135,33 @@ public class OAuthController {
     	return new OAuthResult<>(true);
     }
+    
+    private List<Long> queryOpTreeByOpIds(List<Long> queryOpList,List<Long> opList){
+    	  if(queryOpList != null && CollectionUtil.isNotEmpty(queryOpList)){
+    		  AsraOpQueryReq asraOpQueryRe = new AsraOpQueryReq();
+    		  asraOpQueryRe.setOpParentIdLists(queryOpList);
+			  asraOpQueryRe.getBaseRequest().setPageNum(1);
+			  asraOpQueryRe.getBaseRequest().setPageSize(0);
+			  BizResult<PageBean<AsraOpDTO>>  asraOpReult = asraOpQueryService.queryAsraOpForPage(asraOpQueryRe);
+    	      if(asraOpReult != null && asraOpReult.getData() != null){
+				  queryOpList.clear();
+    	    	  List<AsraOpDTO> data = asraOpReult.getData().getDataList();
+    	    	  if(CollectionUtil.isNotEmpty(data)){
+					  for(AsraOpDTO dto:data){
+						  queryOpList.add(dto.getId());
+						  opList.add(dto.getId());
+					  }
+    	    	  }
+    	    	  queryOpTreeByOpIds(queryOpList,opList);
+    	      }
+    	  }
+    	return opList;
+    }
+
+
     /**
      * 递归查询员工id.<br/>
-     * @param parentOpId
+     * @param
      * @param opList
      * @return
      * 2018年8月2日  wangfs.<br/>
@@ -160,66 +184,65 @@ public class OAuthController {
     	}
     	return rootAllList;
     }
-    
-    /**
-     * 递归查找一级以下的用户
-     * @param parentId
-     * @return
-     * 2018年8月2日  wangfs.<br/>
-     */
-    private List<Long>  getChildOpIds(Long parentId,List<Long> childOpIds){
-    	  AsraOpQueryReq asraOpQueryRe = new AsraOpQueryReq();
-		  asraOpQueryRe.setParentId(parentId);
-	      BizResult<List<AsraOpDTO>> asraOpReult = asraOpQueryService.queryAsraOpByParentId(asraOpQueryRe);
-	      if(asraOpReult != null && CollectionUtil.isNotEmpty(asraOpReult.getData())){
-	    	  List<AsraOpDTO> list = asraOpReult.getData();
-    		  for(AsraOpDTO asraOpDTO :list){
-    			  if(asraOpDTO == null){
-    				 continue;
-    			  }
-    			  childOpIds.add(asraOpDTO.getId());
-    		  }
+	/**
+	 * 递归查找一级以下的用户
+	 * @param parentId
+	 * @return
+	 * 2018年8月2日  wangfs.<br/>
+	 */
+	private List<Long>  getChildOpIds(Long parentId,List<Long> childOpIds){
+		AsraOpQueryReq asraOpQueryRe = new AsraOpQueryReq();
+		asraOpQueryRe.setParentId(parentId);
+		BizResult<List<AsraOpDTO>> asraOpReult = asraOpQueryService.queryAsraOpByParentId(asraOpQueryRe);
+		if(asraOpReult != null && CollectionUtil.isNotEmpty(asraOpReult.getData())){
+			List<AsraOpDTO> list = asraOpReult.getData();
+			for(AsraOpDTO asraOpDTO :list){
+				if(asraOpDTO == null){
+					continue;
+				}
+				childOpIds.add(asraOpDTO.getId());
+			}
+
+			//遍历下一级
+			if(CollectionUtil.isNotEmpty(childOpIds)){
+				for(Long opId:childOpIds){
+					if(opId != null && !opId.equals(parentId)){
+						getChildOpIds(opId,childOpIds);
+					}
+					break;
+
+				}
+
+			}
+		}
+
+		return childOpIds;
+	}
+
+	/**
+	 * 查找登陆用户下一级用户
+	 * @param opId
+	 * @param opList
+	 * @return
+	 * 2018年8月2日  wangfs.<br/>
+	 */
+	private List<Long> getRootOpIds(Long parentId){
+		List<Long> opList = new ArrayList<>();
+		AsraOpQueryReq asraOpQueryRe = new AsraOpQueryReq();
+		asraOpQueryRe.setParentId(parentId);
+		BizResult<List<AsraOpDTO>> asraOpReult = asraOpQueryService.queryAsraOpByParentId(asraOpQueryRe);
+		if(asraOpReult != null && CollectionUtil.isNotEmpty(asraOpReult.getData())){
+			List<AsraOpDTO> list = asraOpReult.getData();
+			for(AsraOpDTO asraOpDTO :list){
+				if(asraOpDTO == null){
+					continue;
+				}
+				opList.add(asraOpDTO.getId());
+			}
+		}
+		return opList;
+	}
+
-    	      //遍历下一级
-    		  if(CollectionUtil.isNotEmpty(childOpIds)){
-    			  for(Long opId:childOpIds){
-    				  if(opId != null && !opId.equals(parentId)){
-    					  getChildOpIds(opId,childOpIds);
-    				  }
-    				  break;
-    				 
-    			  }
-    			 
-    		  }
-	      }
-	     
-    	return childOpIds;
-    }
-    
-    /**
-     * 查找登陆用户下一级用户
-     * @param opId
-     * @param opList
-     * @return
-     * 2018年8月2日  wangfs.<br/>
-     */
-    private List<Long> getRootOpIds(Long parentId){
-    	List<Long> opList = new ArrayList<>();
-    	  AsraOpQueryReq asraOpQueryRe = new AsraOpQueryReq();
-		  asraOpQueryRe.setParentId(parentId);
-	      BizResult<List<AsraOpDTO>> asraOpReult = asraOpQueryService.queryAsraOpByParentId(asraOpQueryRe);
-	      if(asraOpReult != null && CollectionUtil.isNotEmpty(asraOpReult.getData())){
-	    	  List<AsraOpDTO> list = asraOpReult.getData();
-	    		  for(AsraOpDTO asraOpDTO :list){
-	    			  if(asraOpDTO == null){
-	    				 continue;
-	    			  }
-	    			  opList.add(asraOpDTO.getId());
-	    		  }
-	      }  
-	      return opList;
-    }
-    
-	 
 }
@@ -19,43 +19,43 @@
     <result column="modfiy_emp_name" jdbcType="VARCHAR" property="modfiyEmpName" />
     <result column="modfiy_date" jdbcType="TIMESTAMP" property="modfiyDate" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="parent_id" jdbcType="BIGINT" property="parentId" />
   </resultMap>
   <sql id="Base_Column_List">
-    id, login_code, login_password, op_name, email, role_id, city_id, city_name, 
-    is_remind_email, data_state, create_empid, create_emp_name, create_date, modfiy_empid, 
-    modfiy_emp_name, modfiy_date, remark
+    id, login_code, login_password, op_name, email, role_id, city_id, city_name, is_remind_email,
+    data_state, create_empid, create_emp_name, create_date, modfiy_empid, modfiy_emp_name,
+    modfiy_date, remark, parent_id
   </sql>
-  <select id="queryAsraOpForList" parameterType="com.zteits.oa.api.dto.asraop.param.AsraOpQueryReq" resultType="com.zteits.oa.api.dto.asraop.AsraOpDTO">
+  <select id="queryAsraOpForList" parameterType="com.zteits.oa.api.dto.asraop.param.AsraOpQueryReq" resultMap="BaseResultMap">
     select
-    ap.id id,
-    ap.login_code loginCode,
-    ap.op_name opName,
-    ap.email email,
-    ap.role_id roleId,
-    ap.city_id cityId,
-    ap.city_name cityName,
-    ap.is_remind_email isRemindEmail
-    from asra_op ap left join asra_op_relations apr on ap.id = apr.op_id
+      <include refid="Base_Column_List" />
+    from asra_op
     where 1=1
       <if test="id != null ">
-        and (apr.parent_id = #{id} or ap.id = #{id})
+         id = #{id}
       </if>
       <if test="loginCode != null and loginCode !=''">
-        and ap.login_code = #{loginCode,jdbcType=VARCHAR}
+        and login_code = #{loginCode,jdbcType=VARCHAR}
       </if>
       <if test="opName != null and opName != ''">
-        and ap.op_name like concat('%','${opName}','%')
+        and op_name like concat('%','${opName}','%')
       </if>
       <if test="email != null and email != ''">
-        and ap.email = #{email,jdbcType=VARCHAR}
+        and email = #{email,jdbcType=VARCHAR}
       </if>
       <if test="opIdLists != null">
-        and ap.id in
+        and id in
         <foreach collection="opIdLists" item="opId"  open="(" close=")" separator="," >
           #{opId}
         </foreach>
       </if>
+    <if test="opParentIdLists != null">
+      and parent_id in
+      <foreach collection="opParentIdLists" item="opId"  open="(" close=")" separator="," >
+        #{opId}
+      </foreach>
+    </if>
   </select>
   </mapper>
 \ No newline at end of file