Merge branch 'feature_deptSelect_lpf' of http://121.42.41.42:7070/r/esua-epdc-cloud into feature_deptSelect_lpf

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<EpdcEventsDao, EpdcEv
             issueHandleEntity.setAdvice(dto.getAdvice());
             issueHandleEntity.setHandlerDeptId(dto.getHandleDeptId());
             issueHandleEntity.setHandlerDept(dto.getHandleDeptName());
-            UserDetail user = SecurityUser.getUser();
+//            UserDetail user = SecurityUser.getUser();
             /*issueHandleEntity.setHandlerDeptId(user.getDeptId());
             issueHandleEntity.setHandlerDept(user.getDeptName());*/
             issueHandleService.insert(issueHandleEntity);

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java

@@ -346,12 +346,4 @@ public interface ItemDao extends BaseDao<ItemEntity> {
      */
     List<ItemDTO> 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);
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -478,9 +478,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
      */
     @Override
     public Result<List<ItemCirculationDeptResultDTO>> 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<ItemCirculationDeptResultDTO> deptResultDTOS = new ArrayList<>();
         // 网格-可做操作和可流转部门
@@ -1397,9 +1400,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     @Override
     public Result<List<ItemHandleResultDTO>> queryHandleCategories(EventDeptFormDTO formDto) {
         List<ItemHandleResultDTO> 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) {

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'),'-',',') )
     </select>
-    <select id="selectDeptTypeKeyById" resultType="java.lang.String">
-        select type_key from esua_epdc_admin.sys_dept where id=#{deptId}
-    </select>
 </mapper>