工作端接口补全

epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/item/controller/v2/EpdcAppWorkEventItemV2Controller.java

@@ -0,0 +1,58 @@
+package com.elink.esua.epdc.modules.item.controller.v2;
+
+import com.elink.esua.epdc.commons.api.version.ApiVersion;
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.item.result.ItemCirculationDeptResultDTO;
+import com.elink.esua.epdc.dto.item.result.ItemHandleResultDTO;
+import com.elink.esua.epdc.modules.item.service.ItemService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 工作端事件 迭代接口 v2
+ *
+ * @author zy
+ * @date 2020/05/06
+ */
+
+@ApiVersion(2)
+@RestController("EpdcAppWorkEventItemV2Controller")
+@RequestMapping(Constant.EPDC_APP + "work/event/item" + Constant.VERSION_CONTROL)
+public class EpdcAppWorkEventItemV2Controller {
+
+    @Autowired
+    private ItemService itemService;
+
+    /**
+     * 获取可吹哨部门V2
+     *
+     * @param:
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemCirculationDeptResultDTO>>
+     * @Author: zy
+     * @Date: 2020-05-06
+     */
+    @GetMapping("whistlingDept")
+    public Result<List<ItemCirculationDeptResultDTO>> whistlingDept() {
+        List<ItemCirculationDeptResultDTO> list = this.itemService.listWhistlingDept();
+        return new Result<List<ItemCirculationDeptResultDTO>>().ok(list);
+    }
+
+    /**
+     * 获取当前部门可做操作V2
+     *
+     * @param:
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemHandleResultDTO>>
+     * @Author: zy
+     * @Date: 2020-05-06
+     */
+    @GetMapping("handleCategory")
+    public Result<List<ItemHandleResultDTO>> handleCategory() {
+        List<ItemHandleResultDTO> list = this.itemService.listHandleCategory();
+        return new Result<List<ItemHandleResultDTO>>().ok(list);
+    }
+}

epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java

@@ -373,35 +373,52 @@ public interface ItemService extends BaseService<ItemEntity> {
     List<KpiEvaluationAmountResultDTO> statGridEvaluationMetaData(KpiMetaDataOfEventsFormDTO metaDataFormDto);
 
     /**
-     *
      * 项目修改组织机构信息
      *
-     * @params [dto]
      * @return void
+     * @params [dto]
      * @author liuchuang
      * @since 2020/3/7 1:23
      */
     void modifyOrganizationInfo(OrganizationModifyDTO dto);
 
     /**
-     *
      * 更新项目表党员群名称
      *
-     * @params [groups]
      * @return void
+     * @params [groups]
      * @author liuchuang
      * @since 2020/3/7 12:50
      */
     void modifyPartyGroupName(List<GroupFormDTO> groups);
 
     /**
-     *
      * 修改分类信息
      *
-     * @params []
      * @return void
+     * @params []
      * @author liuchuang
      * @since 2020/3/7 16:33
      */
     void modifyCategoryInfo(CategoryModifyDTO dto);
+
+    /**
+     * 获取可吹哨部门V2
+     *
+     * @param:
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.item.result.ItemCirculationDeptResultDTO>>
+     * @Author: zy
+     * @Date: 2020-05-06
+     */
+    List<ItemCirculationDeptResultDTO> listWhistlingDept();
+
+    /**
+     * 获取当前部门可做操作V2
+     *
+     * @param:
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.item.result.ItemHandleResultDTO>>
+     * @Author: zy
+     * @Date: 2020-05-06
+     */
+    List<ItemHandleResultDTO> listHandleCategory();
 }

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

@@ -1360,6 +1360,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId, user.getTypeKey());//做回应处理，向部门下的所有人员发送短信
         }
     }
+
     /**
      * @Description: 居民端：项目处理，发送短信
      * @Param: [dto]
@@ -1379,6 +1380,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         }
         issueOverseeResultsTask.sendSmsNotice(sms);
     }
+
     /**
      * @param
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.item.result.ItemHandleResultDTO>>
@@ -1457,11 +1459,10 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     }
 
     /**
-     *
      * 组织机构信息处理
      *
-     * @params [dto, eventsList]
      * @return java.util.List<com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity>
+     * @params [dto, eventsList]
      * @author liuchuang
      * @since 2020/3/7 1:17
      */
@@ -1517,12 +1518,36 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         }
     }
 
+    @Override
+    public List<ItemCirculationDeptResultDTO> listWhistlingDept() {
+        UserDetail user = SecurityUser.getUser();
+        Result<List<Long>> roleIdList = adminFeignClient.getRoleIdList(user.getId());
+        if (!roleIdList.success() || roleIdList.getData().isEmpty()) {
+            throw new RenException("获取角色Id列表失败");
+        }
+
+        //可流转部门
+        List<ItemCirculationDeptResultDTO> deptResultDTOS = handleRoleCategoryService.listItemCirculationDeptResultDTO(roleIdList.getData());
+        return deptResultDTOS;
+    }
+
+    @Override
+    public List<ItemHandleResultDTO> listHandleCategory() {
+        UserDetail user = SecurityUser.getUser();
+        Result<List<Long>> roleIdList = adminFeignClient.getRoleIdList(user.getId());
+        if (!roleIdList.success() || roleIdList.getData().isEmpty()) {
+            throw new RenException("获取角色Id列表失败");
+        }
+        //可处理操作
+        List<ItemHandleResultDTO> handleResultDTOS = handleRoleCategoryService.listItemHandleResultDTO(roleIdList.getData());
+        return handleResultDTOS;
+    }
+
     /**
-     *
      * 分类信息处理
      *
-     * @params [dto, eventsList]
      * @return java.util.List<com.elink.esua.epdc.modules.events.entity.ItemEntity>
+     * @params [dto, eventsList]
      * @author liuchuang
      * @since 2020/3/7 17:00
      */