From a14a4e896e8c576de63c3e10b72504b291224b75 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 15 Apr 2020 20:15:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=89=93=E5=88=86-=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=89=93=E5=88=86=E7=BB=93=E6=9E=9C=20=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/epdc/form/UserSysDeptInfoFormDTO.java | 5 ++ .../epdc/service/impl/SysDeptServiceImpl.java | 7 ++- .../src/main/resources/mapper/SysDeptDao.xml | 3 + .../service/impl/ManualScoreServiceImpl.java | 63 +++---------------- 4 files changed, 21 insertions(+), 57 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/UserSysDeptInfoFormDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/UserSysDeptInfoFormDTO.java index 3f530eec5..1779afaf2 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/UserSysDeptInfoFormDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/UserSysDeptInfoFormDTO.java @@ -22,4 +22,9 @@ public class UserSysDeptInfoFormDTO implements Serializable { * 部门类型键值 */ private List typeKeyList; + + /** + * 部门名称 + */ + private String deptName; } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index 273dfc9f4..1960db6b5 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -900,10 +900,15 @@ public class SysDeptServiceImpl extends BaseServiceImpl listAllDeptInfo(UserSysDeptInfoFormDTO formDTO) { Map map = new HashMap<>(); - map.put("typeKey", formDTO.getTypeKeyList().get(0)); + if (formDTO.getTypeKeyList() != null && formDTO.getTypeKeyList().size() >0) { + map.put("typeKey", formDTO.getTypeKeyList().get(0)); + } if (formDTO.getDeptIdList() != null && formDTO.getDeptIdList().size() >0) { map.put("deptId", formDTO.getDeptIdList().get(0)); } + if (formDTO.getDeptName() != null && formDTO.getDeptName() != "") { + map.put("deptName", formDTO.getDeptName()); + } List list = baseDao.selectListAllDeptInfo(map); // 获取全部的部门信息 return list; } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml index 8125768f8..5dfda6dbb 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml @@ -301,5 +301,8 @@ AND instr(sd.pids, #{deptId}) > 0 + + AND sd.NAME = #{deptName} + diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/ManualScoreServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/ManualScoreServiceImpl.java index 08d5acb54..2437fb604 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/ManualScoreServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/ManualScoreServiceImpl.java @@ -27,7 +27,6 @@ import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant; import com.elink.esua.epdc.commons.tools.constant.StrConstant; import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; -import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.security.user.UserDetail; @@ -276,15 +275,13 @@ public class ManualScoreServiceImpl extends BaseServiceImpl deptList = getDeptListByDateScope(user.getDeptIdList()); - DeptLevelAndLeaderDTO deptByExcelData = getDeptByExcelData(excelData, deptList); - if (null == deptByExcelData) { - throw new RenException("匹配数据权限失败"); - } - - DeptLevelAndLeaderDTO deptLevelInfo = deptUtils.getDeptLevelInfo(deptByExcelData.getDeptId(), YesOrNoEnum.YES); + UserSysDeptInfoFormDTO userSysDeptInfoFormDTO = new UserSysDeptInfoFormDTO(); + userSysDeptInfoFormDTO.setDeptName(excelData.getDeptName()); + //根据部门名称获取部门id及所有详细信息 + Result> deptInfo = adminFeignClient.queryAllDeptInfo(userSysDeptInfoFormDTO); + List userSysDeptInfoResultDTOList = deptInfo.getData(); + + DeptLevelAndLeaderDTO deptLevelInfo = deptUtils.getDeptLevelInfo(userSysDeptInfoResultDTOList.get(0).getId(), YesOrNoEnum.YES); ManualScoreEntity manualScoreEntity = new ManualScoreEntity(); manualScoreEntity.setDeptId(deptLevelInfo.getDeptId()); manualScoreEntity.setAllDeptIds(deptLevelInfo.getAllDeptIds()); @@ -305,52 +302,6 @@ public class ManualScoreServiceImpl extends BaseServiceImpl - * @Author: zy - * @Date: 2020-04-14 - */ - private List getDeptListByDateScope(List deptIdList) { - List deptList = Lists.newArrayList(); - DeptLevelAndLeaderDTO deptLevelInfo; - for (Long deptId : deptIdList) { - deptLevelInfo = deptUtils.getDeptLevelInfo(deptId, YesOrNoEnum.NO); - deptList.add(deptLevelInfo); - } - return deptList; - } - - /** - * @Description: 从数据权限的所有部门中，匹配excel中的一行数据 - * @param excelData excel中的某一行 - * @param deptList 用户部门权限中的所有部门 - * @return: com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO - * @Author: zy - * @Date: 2020-04-14 - */ - private DeptLevelAndLeaderDTO getDeptByExcelData(ManualScoreExcel excelData, List deptList) { - String[] deptNameAll = excelData.getDeptName().split("-"); - String allDeptNames = ""; - if (deptNameAll.length == 3) { - allDeptNames = deptNameAll[0].trim() - .concat(StrConstant.HYPHEN).concat(deptNameAll[1].trim()) - .concat(StrConstant.HYPHEN).concat(deptNameAll[2].trim()); - } else if (deptNameAll.length == 2) { - allDeptNames = deptNameAll[0].trim() - .concat(StrConstant.HYPHEN).concat(deptNameAll[1].trim()); - } else if (deptNameAll.length == 1) { - allDeptNames = deptNameAll[0].trim(); - } - for (DeptLevelAndLeaderDTO oneDept : deptList) { - if (oneDept.getAllDeptNames().contains(allDeptNames)) { - return oneDept; - } - } - return null; - } - /** * 删除文件夹（强制删除） *