From 62166423f369bb0eaee63d4068a449a1c672ced5 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 9 Oct 2020 14:06:11 +0800 Subject: [PATCH] =?UTF-8?q?admin=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E3=80=90=E6=A0=B9=E6=8D=AEdeptid=E6=9F=A5=E8=AF=A2=E4=B8=8B?= =?UTF-8?q?=E7=BA=A7=E6=89=80=E6=9C=89=E9=83=A8=E9=97=A8ID&=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E3=80=91-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-10-09?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UserSysDeptInfoByDeptIdResultDTO.java | 55 +++++++++++++++++++ .../epdc/controller/SysDeptController.java | 14 +++++ .../com/elink/esua/epdc/dao/SysDeptDao.java | 11 ++++ .../esua/epdc/service/SysDeptService.java | 11 ++++ .../epdc/service/impl/SysDeptServiceImpl.java | 7 +++ .../src/main/resources/mapper/SysDeptDao.xml | 19 +++++++ 6 files changed, 117 insertions(+) create mode 100644 esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/UserSysDeptInfoByDeptIdResultDTO.java diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/UserSysDeptInfoByDeptIdResultDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/UserSysDeptInfoByDeptIdResultDTO.java new file mode 100644 index 000000000..54e807f22 --- /dev/null +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/UserSysDeptInfoByDeptIdResultDTO.java @@ -0,0 +1,55 @@ +package com.elink.esua.epdc.dto.epdc.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author wgf + * @Date 2020/09/30 15:05 + */ +@Data +public class UserSysDeptInfoByDeptIdResultDTO implements Serializable { + private static final long serialVersionUID = -4240447826256510696L; + + /** + * 第一级ID + */ + private String firstId; + + /** + * 第一级名称 + */ + private String firstName; + + /** + * 第二级ID + */ + private String secondId; + + /** + * 第二级名称 + */ + private String secondName; + + /** + * 第三级ID + */ + private String threeId; + + /** + * 第三级名称 + */ + private String threeName; + + /** + * 第四级ID + */ + private String foreId; + + /** + * 第四级名称 + */ + private String foreName; +} 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 863d79e33..d68d88494 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 @@ -20,6 +20,7 @@ import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.dto.epdc.form.ExportTemplateInfoFormDTO; import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO; import com.elink.esua.epdc.dto.epdc.result.ExportKpiResultDTO; +import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoByDeptIdResultDTO; import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO; import com.elink.esua.epdc.service.SysDeptService; import io.swagger.annotations.Api; @@ -187,6 +188,19 @@ public class SysDeptController { return sysDeptService.getCompleteDeptList(deptId); } + /** + * 根据部门id，获取部门以及以下所有部门ID & NAME + * + * @param deptId + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author wanggongfeng + * @date 2020/09/30 15:05 + */ + @GetMapping("getDeptInfoByDeptIdList/{deptId}") + public Result getDeptInfoByDeptIdList(@PathVariable("deptId") String deptId) { + return sysDeptService.getDeptInfoByDeptIdList(deptId); + } + /** * @param formDTO * @return com.elink.esua.epdc.commons.tools.utils.Result> 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 0f5d5f29a..1e3598c65 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 @@ -14,6 +14,7 @@ import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO; import com.elink.esua.epdc.dto.epdc.form.ExportTemplateInfoFormDTO; import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO; import com.elink.esua.epdc.dto.epdc.result.ExportKpiResultDTO; +import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoByDeptIdResultDTO; import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO; import com.elink.esua.epdc.entity.SysDeptEntity; import org.apache.ibatis.annotations.Mapper; @@ -77,6 +78,16 @@ public interface SysDeptDao extends BaseDao { */ CompleteDeptDTO getCompleteDept(@Param("gridId") Long gridId); + /** + * 根据部门id，获取部门以及以下所有部门ID & NAME + * + * @param deptId + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author wanggongfeng + * @date 2020/09/30 15:05 + */ + UserSysDeptInfoByDeptIdResultDTO getDeptInfoByDeptIdList(@Param("deptId") String deptId); + /** * 通过网格ID获取该网格所有上级机构 * 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 249f91e06..a930087a8 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 @@ -16,6 +16,7 @@ import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO; import com.elink.esua.epdc.dto.epdc.form.ExportTemplateInfoFormDTO; import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO; import com.elink.esua.epdc.dto.epdc.result.ExportKpiResultDTO; +import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoByDeptIdResultDTO; import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO; import com.elink.esua.epdc.entity.SysDeptEntity; @@ -146,6 +147,16 @@ public interface SysDeptService extends BaseService { */ Result> getCompleteDeptList(Long deptId); + /** + * 根据部门id，获取部门以及以下所有部门ID & NAME + * + * @param deptId + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author wanggongfeng + * @date 2020/09/30 15:05 + */ + Result getDeptInfoByDeptIdList(String deptId); + /** * 组装用户部门多层结构 * 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 6789f7d3c..28e11dd10 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 @@ -35,6 +35,7 @@ import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO; import com.elink.esua.epdc.dto.epdc.form.ExportTemplateInfoFormDTO; import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO; import com.elink.esua.epdc.dto.epdc.result.ExportKpiResultDTO; +import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoByDeptIdResultDTO; import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO; import com.elink.esua.epdc.entity.SysDeptEntity; import com.elink.esua.epdc.feign.GroupFeignClient; @@ -342,6 +343,12 @@ public class SysDeptServiceImpl extends BaseServiceImpl getDeptInfoByDeptIdList(String deptId) { + UserSysDeptInfoByDeptIdResultDTO list = this.baseDao.getDeptInfoByDeptIdList(deptId); + return new Result().ok(list); + } + @Override public DeptOption getUserDeptOption() { return getUserDeptOption(SecurityUser.getUserId()); 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 4c55f733c..e3e87a182 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 @@ -20,6 +20,25 @@ where t1.id = #{value} and t1.del_flag = 0 + +