From 5acc490fa6f77a9ed7b5976ee6a2e22b070df5bf Mon Sep 17 00:00:00 2001 From: ludc Date: 星期二, 09 七月 2024 09:49:36 +0800 Subject: [PATCH] 角色管理联调修改、部门管理接口等代码上传 --- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/OrgDeptQueryServiceI.java | 78 ++++++++++++++++++++++++++++++++++----- 1 files changed, 68 insertions(+), 10 deletions(-) diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/OrgDeptQueryServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/OrgDeptQueryServiceI.java index 754f12a..605caf1 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/OrgDeptQueryServiceI.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/OrgDeptQueryServiceI.java @@ -1,13 +1,12 @@ package com.vci.frameworkcore.compatibility; import com.vci.corba.common.PLException; +import com.vci.frameworkcore.model.dto.OrgDepartmentDTO; import com.vci.frameworkcore.pagemodel.OrgDepartmentVO; import com.vci.starter.web.exception.VciBaseException; -import com.vci.starter.web.pagemodel.DataGrid; -import com.vci.starter.web.pagemodel.PageHelper; -import com.vci.starter.web.pagemodel.Tree; -import com.vci.starter.web.pagemodel.TreeQueryObject; +import com.vci.starter.web.pagemodel.*; +import java.io.File; import java.util.Collection; import java.util.List; import java.util.Map; @@ -26,6 +25,15 @@ * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮暟鎹簱瀛樺湪闂鐨勬椂鍊欎細鎶涘嚭寮傚父 */ OrgDepartmentVO getDeptByDeptOid(String deptOid) throws VciBaseException; + + /** + * 鏍规嵁鐖堕儴闂ㄤ富閿幏鍙栧拰閮ㄩ棬鍚嶇О閮ㄩ棬鐨勪俊鎭� + * @param parentDeptOid 鐖堕儴闂ㄤ富閿� + * @param conditionMap 鏌ヨ鏉′欢 + * @return 閮ㄩ棬鐨勬樉绀哄璞★紝濡傛灉閮ㄩ棬涓嶅瓨鍦ㄥ垯杩斿洖null锛屼笉浼氭姏鍑哄紓甯� + * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮暟鎹簱瀛樺湪闂鐨勬椂鍊欎細鎶涘嚭寮傚父 + */ + List<OrgDepartmentVO> getDeptByDeptPOidAndCondition(String parentDeptOid,Map<String,String> conditionMap) throws VciBaseException; /** * 鎵归噺鑾峰彇閮ㄩ棬鐨勪俊鎭� 锛堟牴鎹儴闂ㄤ富閿級 @@ -80,9 +88,17 @@ * 鎵归噺鏍规嵁鐢ㄦ埛鐨勪富閿潵鑾峰彇閮ㄩ棬 * @param userOidCollection 鐢ㄦ埛涓婚敭闆嗗悎 * @param queryMap 鏌ヨ鏉′欢锛屽鏋滈渶瑕佷娇鐢ㄧ敤鎴风殑灞炴�ф潵鏌ヨ鍙互浣跨敤pkUser.xxxx - * @return 閮ㄩ棬鐨勬樉绀哄璞★紝key鏄敤鎴蜂富閿�,value鏄繖涓敤鎴峰叧鑱旂殑閮ㄩ棬 + * @return 閮ㄩ棬鐨勬樉绀哄璞★紝key鏄敤鎴蜂富閿�,value鏄叧鑱旂殑閮ㄩ棬 */ Map<String,List<OrgDepartmentVO>> batchListDeptByUserOids(Collection<String> userOidCollection, Map<String, String> queryMap); + + /** + * 鎵归噺鏍规嵁鐢ㄦ埛鐨勪富閿潵鑾峰彇閮ㄩ棬鍚嶇О锛�/闂撮殧鏂瑰紡锛� + * @param userOidCollection 鐢ㄦ埛涓婚敭闆嗗悎 + * @param queryMap 鏌ヨ鏉′欢锛屽鏋滈渶瑕佷娇鐢ㄧ敤鎴风殑灞炴�ф潵鏌ヨ鍙互浣跨敤pkUser.xxxx + * @return 閮ㄩ棬鐨勬樉绀哄璞★紝key鏄敤鎴蜂富閿�,value鏄叧鑱旂殑閮ㄩ棬锛坘ey:鍏宠仈鐨勯儴闂╫id,value:鍖呭惈鐖惰妭鐐瑰褰撳墠閮ㄩ棬涓轰汉鍔涜祫婧愰儴鍒欏�间负锛�550/浜哄姏璧勬簮閮級 + */ + Map<String,Map<String,String>> batchMapDeptNameByUserOids(Collection<String> userOidCollection, Map<String, String> queryMap); /** * 鑾峰彇鏌愪釜閮ㄩ棬鐨勭洿灞炰笅绾ч儴闂� @@ -93,7 +109,7 @@ List<OrgDepartmentVO> listChildrenDeptByParentOid(String pkFatherDepartmment, Map<String, String> queryMap); /** - * 鑾峰彇鏌愪釜閮ㄩ棬鐨勬墍鏈夋浘缁忕殑涓嬬骇閮ㄩ棬 + * 鑾峰彇鏌愪釜閮ㄩ棬鐨勬墍鏈夊眰绾х殑涓嬬骇閮ㄩ棬 * @param pkFatherDepartmment 閮ㄩ棬鐨勪富閿� * @param queryMap 鏌ヨ鏉′欢 * @return 閮ㄩ棬鏄剧ず瀵硅薄 @@ -115,11 +131,53 @@ DataGrid refTreeGridDept(TreeQueryObject treeQueryObject); /** - * 淇濆瓨閮ㄩ棬瑙掕壊鍏宠仈淇℃伅锛屽甫鏌ラ噸鍔熻兘 - * @param userId 鐢ㄦ埛id - * @param deptIds 閮ㄩ棬oid + * 淇濆瓨閮ㄩ棬瑙掕壊鍏宠仈淇℃伅锛屽甫鏌ラ噸鍔熻兘锛屽瀵瑰淇濆瓨 + * @param userOIds 鐢ㄦ埛id + * @param deptId 閮ㄩ棬oid * @return */ - boolean saveUserDepts(String userId, List<String> deptIds) throws PLException; + boolean saveUsersDept(String[] userOIds, String deptId) throws PLException; + + /** + * 澧炲姞閮ㄩ棬淇℃伅 + * @param orgDepartmentDTO + * @return + */ + boolean addDept(OrgDepartmentDTO orgDepartmentDTO) throws PLException; + + /** + * 淇敼閮ㄩ棬淇℃伅 + * @param orgDepartmentDTO + * @return + */ + boolean updateDept(OrgDepartmentDTO orgDepartmentDTO) throws PLException; + + /** + * 鍒犻櫎閮ㄩ棬 + * @param ids + * @return + */ + boolean deleteDept(String[] ids) throws PLException; + + /** + * 鑾峰彇鎵�鏈夐儴闂ㄧ殑淇℃伅 + * @return key锛氶儴闂ㄧ敱鍚嶇О缁勬垚鐨勮矾寰勶紙/闂撮殧锛夛紝value瀵瑰簲鏈�灏忓眰绾х殑閮ㄩ棬淇℃伅 + */ + Map<String,OrgDepartmentVO> getDeptAllTreeMap(); + + /** + * 涓嬭浇瀵煎叆閮ㄩ棬鐨別xcel妯℃澘銆� + * @param downloadFileName + * @return + */ + String downloadImportTemplate(String downloadFileName); + + /** + * 瀵煎叆閮ㄩ棬 + * @param file + * @return + * @throws VciBaseException + */ + BaseResult importDept(File file) throws VciBaseException; } -- Gitblit v1.9.3