From 181e2bd9780d526a27f56f6ce9ee8582e30cad2a Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 6 May 2020 17:34:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=89=93=E5=88=86=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/SysDeptController.java | 14 +++++++ .../com/elink/esua/epdc/dao/SysDeptDao.java | 9 +++++ .../esua/epdc/service/SysDeptService.java | 9 +++++ .../epdc/service/impl/SysDeptServiceImpl.java | 5 +++ .../src/main/resources/mapper/SysDeptDao.xml | 27 ++++++++++++- .../esua/epdc/feign/AdminFeignClient.java | 24 +++++++---- .../fallback/AdminFeignClientFallback.java | 5 +++ .../service/impl/ManualScoreServiceImpl.java | 40 +++++++++++++------ .../main/resources/mapper/ManualScoreDao.xml | 8 +++- 9 files changed, 120 insertions(+), 21 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java index 4c0113e05..dd1a812f6 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java @@ -294,4 +294,18 @@ public class SysDeptController { List list = sysDeptService.listAllDeptInfo(formDTO); return new Result>().ok(list); } + + /** + * @param formDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Description 获取用户数据权限信息: 机构类型键值 + * @Date 2020-05-06 + **/ + @PostMapping("queryUserSysDeptTypeKey") + public Result> queryUserSysDeptTypeKey(@RequestBody UserSysDeptInfoFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + List list = sysDeptService.queryUserSysDeptTypeKey(formDTO); + return new Result>().ok(list); + } } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java index a1d9e8bab..60ff3154c 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java @@ -201,4 +201,13 @@ public interface SysDeptDao extends BaseDao { * @Date: 2020-04-14 */ List selectListAllDeptInfo(Map map); + + /** + * @param formDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Description 获取用户数据权限信息: 机构类型键值 + * @Date 2020-05-06 + **/ + List selectListUserSysDeptTypeKey(UserSysDeptInfoFormDTO formDTO); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java index 12ed3179a..90a6c19aa 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java @@ -271,4 +271,13 @@ public interface SysDeptService extends BaseService { * @Date: 2020-04-14 */ List listAllDeptInfo(UserSysDeptInfoFormDTO formDTO); + + /** + * @param formDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Description 获取用户数据权限信息: 机构类型键值 + * @Date 2020-05-06 + **/ + List queryUserSysDeptTypeKey(UserSysDeptInfoFormDTO formDTO); } 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 7543ca196..6062b9679 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 @@ -1059,6 +1059,11 @@ public class SysDeptServiceImpl extends BaseServiceImpl queryUserSysDeptTypeKey(UserSysDeptInfoFormDTO formDTO) { + return baseDao.selectListUserSysDeptTypeKey(formDTO); + } + /** * * 组织机构名称修改发送MQ消息 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 4a7b850d5..3dab02746 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 @@ -325,10 +325,35 @@ AND sd.type_key = #{typeKey} - AND instr(sd.pids, #{deptId}) > 0 + AND instr(sd.id, #{deptId}) > 0 or instr(sd.pid, #{deptId}) > 0 + + + AND sd.type_key = #{typeKey} AND sd.NAME = #{deptName} + + diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java index cddf6b7c2..874e10a94 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java @@ -63,13 +63,23 @@ public interface AdminFeignClient { Result getDeptInfoById(@PathVariable("deptId") Long deptId, @PathVariable("leaderFlag") String leaderFlag); - /** - * @Description: 获取全部的部门基本信息 - * @Param: [userSysDeptInfoFormDTO] - * @return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: zy - * @Date: 2020-04-14 - */ + /** + * @Description: 获取全部的部门基本信息 + * @Param: [userSysDeptInfoFormDTO] + * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: zy + * @Date: 2020-04-14 + */ @PostMapping(value = "sys/dept/queryAllDeptInfo", consumes = MediaType.APPLICATION_JSON_VALUE) Result> queryAllDeptInfo(UserSysDeptInfoFormDTO userSysDeptInfoFormDTO); + + /** + * @param userSysDeptInfoFormDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Description 获取用户数据权限信息: 机构类型键值 + * @Date 2020-05-06 + **/ + @PostMapping(value = "sys/dept/queryUserSysDeptTypeKey", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> queryUserSysDeptTypeKey(UserSysDeptInfoFormDTO userSysDeptInfoFormDTO); } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java index e0825dde8..af0e7cbe1 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java @@ -45,4 +45,9 @@ public class AdminFeignClientFallback implements AdminFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "queryAllDeptInfo", userSysDeptInfoFormDTO); } + @Override + public Result> queryUserSysDeptTypeKey(UserSysDeptInfoFormDTO userSysDeptInfoFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "queryUserSysDeptTypeKey", userSysDeptInfoFormDTO); + } + } 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 d764842e7..6611188bd 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 @@ -164,9 +164,24 @@ public class ManualScoreServiceImpl extends BaseServiceImpl dataScopeDeptList = new ArrayList<>(); - if (!("".equals(params.get("deptId")))){ - long deptId = Long.valueOf(params.get("deptId").toString()).longValue(); - dataScopeDeptList.add(deptId); + + List deptIdList = SecurityUser.getUser().getDeptIdList(); //获取用户权限 + UserSysDeptInfoFormDTO userSysDeptInfoFormDTO = new UserSysDeptInfoFormDTO(); + userSysDeptInfoFormDTO.setDeptIdList(deptIdList); + Result> deptTypeKeys =adminFeignClient.queryUserSysDeptTypeKey(userSysDeptInfoFormDTO); + + if (!("".equals(params.get("deptId")))){ //根据选择部门 项导出模板 + for (int i = 0; i < deptTypeKeys.getData().size(); i++){ + if (deptType.equals(deptTypeKeys.getData().get(i).getTypeKey())){ + dataScopeDeptList.add(deptTypeKeys.getData().get(i).getId()); + } + } + } else { //根据默认数据权限导出模板 + for (int i = 0; i < deptTypeKeys.getData().size(); i++){ + if (deptType.equals(deptTypeKeys.getData().get(i).getTypeKey())){ + dataScopeDeptList.add(deptTypeKeys.getData().get(i).getId()); + } + } } // 考核周期开始月 YearMonth scoreStartDateMonth = YearMonth.parse(month); @@ -258,13 +273,13 @@ public class ManualScoreServiceImpl extends BaseServiceImpl recordList, UserDetail user) { StringBuffer deptErrorInfo = new StringBuffer(); for (ManualScoreExcel manualScoreExcel : recordList) { @@ -282,7 +297,7 @@ public class ManualScoreServiceImpl extends BaseServiceImpl> 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()); @@ -371,6 +386,7 @@ public class ManualScoreServiceImpl extends BaseServiceImpl listManualScoreResultDTO(Map params) { params.put("deptId", params.get("deptId").toString()); + params.put("deptIdList", SecurityUser.getUser().getDeptIdList()); IPage page = getPage(params); List list = baseDao.selectListManualScoreResultDTO(params); return new PageData<>(list, page.getTotal()); @@ -396,4 +412,4 @@ public class ManualScoreServiceImpl extends BaseServiceImpl AND m.all_dept_ids like concat('%',#{deptId},'%') + + AND m.DEPT_ID IN + + #{deptId} + + ORDER BY m.SCORE DESC, m.CREATED_TIME DESC @@ -57,4 +63,4 @@ left(m.`MONTH`, 7)= #{monthString} AND m.DEPT_ID = #{deptId} - \ No newline at end of file +