From 0e8ec4af8125355d7091a5c8f08e3265b384a66b Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Sat, 21 Sep 2019 10:04:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=9A=E5=A7=94=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/doc/db/newupdate.sql | 3 +++ .../java/com/elink/esua/epdc/dto/SysDeptDTO.java | 13 +++++++++++++ .../esua/epdc/controller/SysDeptController.java | 15 ++++++++++++++- .../com/elink/esua/epdc/entity/SysDeptEntity.java | 5 +++++ .../elink/esua/epdc/service/SysDeptService.java | 13 ++++++++++++- .../epdc/service/impl/SysDeptServiceImpl.java | 11 +++++++++++ 6 files changed, 58 insertions(+), 2 deletions(-) diff --git a/esua-epdc/doc/db/newupdate.sql b/esua-epdc/doc/db/newupdate.sql index 7a06050d8..0df7bd456 100644 --- a/esua-epdc/doc/db/newupdate.sql +++ b/esua-epdc/doc/db/newupdate.sql @@ -1,2 +1,5 @@ ------------- 2019-09-04 -------------------- ALTER TABLE esua_epdc_admin.sys_dept ADD type_key varchar(50) NULL COMMENT '机构类型键值'; + +------------- 2019-09-20 部门编码-------------------- +ALTER TABLE sys_dept ADD party_code varchar(50) diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java index 1ce5d1e1a..3d5d9d588 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java @@ -62,6 +62,19 @@ public class SysDeptDTO extends TreeNode implements Serializable { */ private String typeKey; + /** + * 部门编码 + */ + private String partyCode; + + public String getPartyCode() { + return partyCode; + } + + public void setPartyCode(String partyCode) { + this.partyCode = partyCode; + } + public void setName(String name) { this.name = name; } 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 1d118e610..973101cb0 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 @@ -56,6 +56,18 @@ public class SysDeptController { return new Result().ok(list); } + /*** + * 通过编码得到党委编码 + * @param partyCode + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2019/9/20 19:56 + */ + @GetMapping("getIdByCode/{partyCode}") + public Result> getIdByCode(@PathVariable("partyCode") String partyCode) { + return new Result>().ok(sysDeptService.getIdByCode(partyCode)); + } + @GetMapping("{id}") @ApiOperation("信息") public Result get(@PathVariable("id") Long id) { @@ -121,8 +133,9 @@ public class SysDeptController { /** * 通过街道ID获取项目可流转部门 + * * @Params: [deptId] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: liuchuang * @Date: 2019/9/16 17:00 */ diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java index 9d7f2b3e3..5e90ca0f5 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java @@ -74,4 +74,9 @@ public class SysDeptEntity extends BaseEntity { */ private String typeKey; + /** + * 部门编码 + */ + private String partyCode; + } 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 f920285bc..86f225b6d 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 @@ -57,7 +57,7 @@ public interface SysDeptService extends BaseService { * 获取所有下属网格ID集合 * * @param pid 部门ID - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author yujintao * @date 2019/9/5 13:45 */ @@ -75,10 +75,21 @@ public interface SysDeptService extends BaseService { /** * 通过街道ID获取项目可流转部门 + * * @Params: [deptId] * @Return: java.util.List * @Author: liuchuang * @Date: 2019/9/16 16:54 */ List listOfItemCirculationDept(Long deptId); + + + /*** + * 通过编码得到党委编码 + * @param partyCode + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2019/9/20 19:57 + */ + Map getIdByCode(String partyCode); } 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 4e5f74519..931835137 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 @@ -206,4 +206,15 @@ public class SysDeptServiceImpl extends BaseServiceImpl getIdByCode(String partyCode) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.select("id"); + wrapper.eq("party_code",partyCode); + SysDeptEntity sysDeptEntity = baseDao.selectOne(wrapper); + Map map=new HashMap<>(); + map.put("id",sysDeptEntity.getId().toString()); + return map; + } + }