From d0754f1f5e1a756a08b99c9de1ddd48c7c286a3e Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 15 May 2020 17:01:26 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=A4=9A=E9=83=A8=E9=97=A8=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=91-=E3=80=90=E4=BA=8B=E4=BB=B6=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E3=80=81=E8=8E=B7=E5=8F=96=E5=BD=93=E5=89=8D=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E5=8F=AF=E5=81=9A=E6=93=8D=E4=BD=9C=E3=80=81=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=8F=AF=E5=90=B9=E5=93=A8=E9=83=A8=E9=97=A8-?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4=E3=80=91-=EF=BC=88?= =?UTF-8?q?=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/05/15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EpdcEventsServiceImpl.java | 3 +-- .../esua/epdc/modules/item/dao/ItemDao.java | 8 -------- .../item/service/impl/ItemServiceImpl.java | 18 ++++++++++++------ .../src/main/resources/mapper/item/ItemDao.xml | 3 --- 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java index 7aaaa6b1e..be6f33603 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java @@ -27,7 +27,6 @@ import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.redis.RedisKeys; import com.elink.esua.epdc.commons.tools.redis.RedisUtils; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; -import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.constant.EventIssueItemState; @@ -242,7 +241,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl { */ List selectListOfCategoryInfo(String oldCategoryName); - /** - * @describe: 根据部门id查询部门键类型 - * @author wangtong - * @date 2020/5/14 13:49 - * @param [deptId] - * @return java.lang.String - */ - String selectDeptTypeKeyById(@Param("deptId") Long deptId); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index ca85bd302..3c9ab1bf0 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -472,9 +472,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem */ @Override public Result> whistlingDept(EventDeptFormDTO formDto) { - String typeKey = baseDao.selectDeptTypeKeyById(formDto.getDeptId()); - if(StringUtils.isBlank(typeKey)){ - throw new RenException("未查到该部门的相关信息。"); + Result deptMessage = adminFeignClient.getDeptTypeKey(formDto.getDeptId()); + String typeKey = ""; + if( 0 == deptMessage.getCode()){ + typeKey = deptMessage.getData().toString(); + }else{ + throw new RenException(deptMessage.getMsg()); } List deptResultDTOS = new ArrayList<>(); // 网格-可做操作和可流转部门 @@ -1391,9 +1394,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Override public Result> queryHandleCategories(EventDeptFormDTO formDto) { List itemHandleResultDTOList = new ArrayList<>(); - String typeKey = baseDao.selectDeptTypeKeyById(formDto.getDeptId()); - if(StringUtils.isBlank(typeKey)){ - throw new RenException("未查到该部门的相关信息。"); + Result deptMessage = adminFeignClient.getDeptTypeKey(formDto.getDeptId()); + String typeKey = ""; + if( 0 == deptMessage.getCode()){ + typeKey = deptMessage.getData().toString(); + }else{ + throw new RenException(deptMessage.getMsg()); } // 获取可操作处理和可流转部门 switch (typeKey) { diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index 4a8e09b19..6dcad3cfc 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -1054,7 +1054,4 @@ WHERE FIND_IN_SET( #{oldCategoryName}, REPLACE(REPLACE(CATEGORY_FULL_NAME,',','uniquecode'),'-',',') ) -