项目管理接口开发

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java

@@ -3,16 +3,16 @@ package com.elink.esua.epdc.controller;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.SysDeptDTO;
+import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO;
+import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO;
 import com.elink.esua.epdc.dto.item.form.ItemFormDTO;
+import com.elink.esua.epdc.dto.item.form.ItemHandleSubmitFormDTO;
 import com.elink.esua.epdc.dto.item.form.ItemStatisticsFormDTO;
-import com.elink.esua.epdc.dto.item.result.ItemResultDTO;
-import com.elink.esua.epdc.dto.item.result.ItemStatisticsResultDTO;
+import com.elink.esua.epdc.dto.item.result.*;
 import com.elink.esua.epdc.service.WorkItemService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -29,14 +29,14 @@ public class ApiWorkItemController {
     private WorkItemService workItemService;
 
     /**
-     * 项目分类统计
+     * 项目统计
      * @Params: [formDto]
      * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO>
      * @Author: lipengfei
      * @Date: 2019/11/18 13:26
      */
     @GetMapping("statistics")
-    public Result<ItemStatisticsResultDTO> itemStatistics(ItemStatisticsFormDTO formDto) {
+    public Result<ItemStatisticsResultDTO> itemStatistics(@RequestBody ItemStatisticsFormDTO formDto) {
         return workItemService.getItemStatistics(formDto);
     }
     /**
@@ -47,8 +47,58 @@ public class ApiWorkItemController {
      * @Date: 2019/11/19 16:34
      */
     @GetMapping("list")
-    public Result<List<ItemResultDTO>> listItems(ItemFormDTO formDto) {
+    public Result<List<ItemResultDTO>> listItems(@RequestBody ItemFormDTO formDto) {
         return workItemService.listItems( formDto);
     }
 
+    /**
+     * 项目详情
+     * @Params: [id]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO>
+     * @Author: lipengfei
+     * @Date: 2019/11/19 16:34
+     */
+    @GetMapping("detail/{id}")
+    public Result<ItemDetailResultDTO> itemDetail(@PathVariable String id) {
+        return workItemService.getItemDetail(id);
+    }
+    /**
+     * 获取满意度评价结果
+     * @Params: [evaluationFormDTO]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author: lipengfei
+     * @Date: 2019/11/19 16:34
+     */
+    @GetMapping("evaluation")
+    public Result<List<ItemDeptEvaluateResultDTO>> evaluation(@RequestBody EvaluationFormDTO evaluationFormDTO) {
+        return workItemService.evaluation(evaluationFormDTO);
+    }
+    /**
+     * 获取可吹哨部门
+     * @Params: [evaluationFormDTO]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author: lipengfei
+     * @Date: 2019/11/19 16:34
+     */
+    @GetMapping("whistlingDept")
+    public Result<List<ItemCirculationDeptResultDTO>> whistlingDept() {
+        return workItemService.whistlingDept();
+    }
+
+    @GetMapping("handleSubmit")
+    public Result handleSubmit(@RequestBody ItemHandleSubmitFormDTO dto) {
+        return workItemService.handleSubmit(dto);
+    }
+    /**
+     * 获取满意度评价部门
+     * @Params: [evaluationFormDTO]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author: lipengfei
+     * @Date: 2019/11/19 16:34
+     */
+    @GetMapping("evaluationDept")
+    public Result<List<ItemEvaluateDeptDTO>> evaluationDept(@RequestBody EvaluationFormDTO evaluationFormDTO) {
+        return workItemService.evaluationDept(evaluationFormDTO);
+    }
+
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java

@@ -2,6 +2,8 @@ package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.SysDeptDTO;
+import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO;
 import com.elink.esua.epdc.dto.item.form.*;
 import com.elink.esua.epdc.dto.item.result.*;
 import com.elink.esua.epdc.feign.fallback.ItemFeignClientFallback;
@@ -42,5 +44,51 @@ public interface WorkItemFeignClient {
      */
     @GetMapping(value = "events/work/item/list", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<ItemResultDTO>> listItems(ItemFormDTO formDto);
+    /**
+     * 项目详情
+     * @Params: [formDto]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemResultDTO>>
+     * @Author: lipengfei
+     * @Date: 2019/11/19 16:42
+     */
+    @GetMapping(value = "events/work/item/detail", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<ItemDetailResultDTO> getItemDetail(ItemDetailFormDTO formDto);
+
+    /**
+     * 获取满意度评价结果
+     * @Params: [evaluationFormDTO]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author: lipengfei
+     * @Date: 2019/11/19 16:34
+     */
+    @GetMapping(value = "events/work/item/evaluation", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<ItemDeptEvaluateResultDTO>> evaluation(EvaluationFormDTO evaluationFormDTO);
+    /**
+     * 获取可吹哨部门
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author: lipengfei
+     * @Date: 2019/11/19 16:34
+     */
+    @GetMapping(value = "events/work/item/whistlingDept", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<ItemCirculationDeptResultDTO>> whistlingDept();
+
+    /**
+     * 项目处理
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author: lipengfei
+     * @Date: 2019/11/19 16:34
+     */
+    @GetMapping(value = "events/work/item/handleSubmit", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result handleSubmit(ItemHandleSubmitFormDTO dto);
+
+    /**
+     * 获取满意度评价部门
+     * @Params: [evaluationFormDTO]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author: lipengfei
+     * @Date: 2019/11/19 16:34
+     */
+    @GetMapping(value = "events/work/item/evaluationDept", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<ItemEvaluateDeptDTO>> evaluationDept(EvaluationFormDTO evaluationFormDTO);
 
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkItemFeignClientFallback.java

@@ -3,6 +3,8 @@ package com.elink.esua.epdc.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.SysDeptDTO;
+import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO;
 import com.elink.esua.epdc.dto.item.form.*;
 import com.elink.esua.epdc.dto.item.result.*;
 import com.elink.esua.epdc.feign.ItemFeignClient;
@@ -29,5 +31,26 @@ public class WorkItemFeignClientFallback implements WorkItemFeignClient {
     public Result<List<ItemResultDTO>> listItems(ItemFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "listItems", formDto);
     }
+    @Override
+    public Result<ItemDetailResultDTO> getItemDetail(ItemDetailFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "getItemDetail", formDto);
+    }
+
+    @Override
+    public Result<List<ItemDeptEvaluateResultDTO>> evaluation(EvaluationFormDTO evaluationFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "evaluation", evaluationFormDTO);
+    }
+    @Override
+    public Result<List<ItemCirculationDeptResultDTO>> whistlingDept() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "whistlingDept");
+    }
+    @Override
+    public Result handleSubmit(ItemHandleSubmitFormDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "handleSubmit");
+    }
+    @Override
+    public Result<List<ItemEvaluateDeptDTO>> evaluationDept(EvaluationFormDTO evaluationFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "evaluationDept", evaluationFormDTO);
+    }
 
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java

@@ -2,11 +2,13 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.SysDeptDTO;
+import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO;
+import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO;
 import com.elink.esua.epdc.dto.item.form.ItemFormDTO;
+import com.elink.esua.epdc.dto.item.form.ItemHandleSubmitFormDTO;
 import com.elink.esua.epdc.dto.item.form.ItemStatisticsFormDTO;
-import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO;
-import com.elink.esua.epdc.dto.item.result.ItemResultDTO;
-import com.elink.esua.epdc.dto.item.result.ItemStatisticsResultDTO;
+import com.elink.esua.epdc.dto.item.result.*;
 
 import java.util.List;
 
@@ -33,4 +35,45 @@ public interface WorkItemService {
      * @Date: 2019/11/19 16:37
      */
     Result<List<ItemResultDTO>> listItems(ItemFormDTO formDto);
+    /**
+     * 项目详情
+     * @Params: [userDetail, itemId]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO>
+     * @Author: lipengfei
+     * @Date: 2019/11/19 16:34
+     */
+    Result<ItemDetailResultDTO> getItemDetail(String itemId);
+    /**
+     * 获取满意度评价结果
+     * @Params: [evaluationFormDTO]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author: lipengfei
+     * @Date: 2019/11/19 16:34
+     */
+    Result<List<ItemDeptEvaluateResultDTO>> evaluation(EvaluationFormDTO evaluationFormDTO);
+    /**
+     * 获取可吹哨部门
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author: lipengfei
+     * @Date: 2019/11/19 16:34
+     */
+    Result<List<ItemCirculationDeptResultDTO>> whistlingDept();
+    /**
+     * 项目处理
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author: lipengfei
+     * @Date: 2019/11/19 16:34
+     */
+    Result handleSubmit(ItemHandleSubmitFormDTO dto);
+
+    /**
+     * 获取满意度评价部门
+     * @Params: [evaluationFormDTO]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author: lipengfei
+     * @Date: 2019/11/19 16:34
+     */
+    Result<List<ItemEvaluateDeptDTO>> evaluationDept(EvaluationFormDTO evaluationFormDTO);
+
+
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java

@@ -2,6 +2,8 @@ package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.SysDeptDTO;
+import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO;
 import com.elink.esua.epdc.dto.item.form.*;
 import com.elink.esua.epdc.dto.item.result.*;
 import com.elink.esua.epdc.feign.ItemFeignClient;
@@ -40,4 +42,32 @@ public class WorkItemServiceImpl implements WorkItemService {
         return workItemFeignClient.listItems(formDto);
     }
 
+    @Override
+    public Result<ItemDetailResultDTO> getItemDetail(String itemId) {
+        ItemDetailFormDTO formDto = new ItemDetailFormDTO();
+        formDto.setItemId(itemId);
+        return workItemFeignClient.getItemDetail(formDto);
+    }
+
+
+    @Override
+    public Result<List<ItemDeptEvaluateResultDTO>> evaluation(EvaluationFormDTO evaluationFormDTO) {
+        return workItemFeignClient.evaluation(evaluationFormDTO);
+    }
+    @Override
+    public Result<List<ItemCirculationDeptResultDTO>> whistlingDept() {
+        return workItemFeignClient.whistlingDept();
+    }
+
+    @Override
+    public Result handleSubmit(ItemHandleSubmitFormDTO dto) {
+
+        return workItemFeignClient.handleSubmit(dto);
+    }
+
+    @Override
+    public Result<List<ItemEvaluateDeptDTO>> evaluationDept(EvaluationFormDTO evaluationFormDTO) {
+        return workItemFeignClient.evaluationDept(evaluationFormDTO);
+    }
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemFormDTO.java

@@ -61,5 +61,5 @@ public class ItemFormDTO implements Serializable {
      * 项目状态 0-待处理，5-已关闭，10-已结案
      */
     @NotNull(message = "项目状态不能为空")
-    private int itemState;
+    private Integer itemState;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java

@@ -23,10 +23,30 @@ public class ItemDetailResultDTO implements Serializable {
      * 事件ID
      */
     private String eventId;
+    /**
+     * 发布时间
+     */
+    private String distributeTime;
     /**
      * 项目内容
      */
     private String content;
+
+    /**
+     * 电话
+     */
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    private String issueAddress;
+
+
+    /**
+     * 所属类别
+     */
+    private String categoryName;
     /**
      * 项目状态 0-处理中，5-已关闭，10-已结案
      */
@@ -63,6 +83,15 @@ public class ItemDetailResultDTO implements Serializable {
      * 踩数
      */
     private Integer opposeNum;
+
+    /**
+     * 评论数
+     */
+    private Integer commentNum;
+    /**
+     * 表态数
+     */
+    private Integer statementNum;
     /**
      * 所属类别ID
      */

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java

@@ -4,8 +4,13 @@ import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.dto.SysDeptDTO;
+import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO;
 import com.elink.esua.epdc.dto.item.form.*;
 import com.elink.esua.epdc.dto.item.result.*;
+import com.elink.esua.epdc.modules.feign.AdminFeignClient;
+import com.elink.esua.epdc.modules.item.service.ItemDeptService;
+import com.elink.esua.epdc.modules.item.service.ItemEvaluateDeptService;
 import com.elink.esua.epdc.modules.item.service.ItemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -24,6 +29,10 @@ public class WorkItemController {
 
     @Autowired
     private ItemService itemService;
+    @Autowired
+    private ItemEvaluateDeptService itemEvaluateDeptService;
+    @Autowired
+    private ItemDeptService itemDeptService;
 
 
     /**
@@ -50,4 +59,70 @@ public class WorkItemController {
         ValidatorUtils.validateEntity(formDto);
         return this.itemService.listItemsByWork(formDto);
     }
-}
+    /**
+     * 项目详情--移动app端用
+     * @Params: [formDto]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO>
+     * @Author: lipengfei
+     * @Date: 2019/11/19 16:46
+     */
+    @GetMapping("detail")
+    public Result<ItemDetailResultDTO> getItemDetail(@RequestBody ItemDetailFormDTO formDto) {
+        //略过FormDto不相关检验
+        formDto.setUserId("NoUser");
+        ValidatorUtils.validateEntity(formDto);
+        return this.itemService.getItemDetailByWork(formDto);
+    }
+    /**
+     * 工作端-获取满意度评价结果
+     * @Params: [evaluationFormDTO]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author: lipengfei
+     * @Date: 2019/11/19 16:34
+     */
+    @GetMapping("evaluation")
+    public Result<List<ItemDeptEvaluateResultDTO>> evaluation(@RequestBody EvaluationFormDTO evaluationFormDTO) {
+        //略过FormDto不相关检验
+        evaluationFormDTO.setEvaluationContent(" ");
+        ValidatorUtils.validateEntity(evaluationFormDTO);
+        List<ItemDeptEvaluateResultDTO> deptEvaluateResultDTOS = itemEvaluateDeptService.listOfDeptEvaluateByItemId(evaluationFormDTO.getItemId());
+        return new Result<List<ItemDeptEvaluateResultDTO>>().ok(deptEvaluateResultDTOS);
+    }
+    /**
+     * 工作端-获取可吹哨部门
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author: lipengfei
+     * @Date: 2019/11/19 16:34
+     */
+    @GetMapping("whistlingDept")
+    public Result<List<ItemCirculationDeptResultDTO>> whistlingDept() {
+        return this.itemService.whistlingDept();
+    }
+    /**
+     * 项目处理提交
+     * @Params: [dto]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author: lipengfei
+     * @Date: 2019/11/19 19:09
+     */
+    @GetMapping("handleSubmit")
+    public Result handleSubmit(@RequestBody ItemHandleSubmitFormDTO dto) {
+        ValidatorUtils.validateEntity(dto);
+        return itemService.modifyHandleResult(dto);
+    }
+    /**
+     * 工作端-获取满意度评价部门
+     * @Params: [evaluationFormDTO]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author: lipengfei
+     * @Date: 2019/11/19 16:34
+     */
+    @GetMapping("evaluationDept")
+    public Result<List<ItemEvaluateDeptDTO>> evaluationDept(@RequestBody EvaluationFormDTO evaluationFormDTO) {
+        //略过FormDto不相关检验
+        evaluationFormDTO.setEvaluationContent(" ");
+        ValidatorUtils.validateEntity(evaluationFormDTO);
+        List<ItemEvaluateDeptDTO> evaluateDeptDTOS = itemDeptService.listOfEvaluateDepts(evaluationFormDTO.getItemId(), SecurityUser.getDeptId());
+        return new Result<List<ItemEvaluateDeptDTO>>().ok(evaluateDeptDTOS);
+    }
+}

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

@@ -78,6 +78,15 @@ public interface ItemDao extends BaseDao<ItemEntity> {
      * @Date: 2019/9/10 20:57
      */
     ItemDetailResultDTO selectOneItemDetail(ItemDetailFormDTO formDto);
+    /**
+     * 工作端-项目详情
+     * @Params: [formDto]
+     * @Return: com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO
+     * @Author: lipengfei
+     * @Date: 2019/9/10 20:57
+     */
+    ItemDetailResultDTO selectOneOfItemDetailForWork(ItemDetailFormDTO formDto);
+
 
     /**
      * 移动端-议题分类统计

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

@@ -151,8 +151,31 @@ public interface ItemService extends BaseService<ItemEntity> {
      */
     Result<ItemDetailResultDTO> getItemDetail(ItemDetailFormDTO formDto);
 
+    /**
+     * 工作端-项目详情
+     * @Params: [formDto]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO>
+     * @Author: lipengfei
+     * @Date: 2019/9/10 20:54
+     */
+    Result<ItemDetailResultDTO> getItemDetailByWork(ItemDetailFormDTO formDto);
 
+
+    /**
+     * 工作端-获取满意度评价结果
+     * @Params: [evaluationFormDTO]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result
+     * @Author: lipengfei
+     * @Date: 2019/9/10 20:54
+     */
     Result evaluation(EvaluationFormDTO evaluationFormDTO);
+    /**
+     * 工作端-获取可吹哨部门
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author: lipengfei
+     * @Date: 2019/11/19 16:34
+     */
+    Result<List<ItemCirculationDeptResultDTO>> whistlingDept();
 
     /**
      * 项目分类统计

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

@@ -207,6 +207,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         List<ItemResultDTO> data = baseDao.selectListOfItems(formDto, states);
         return new Result<List<ItemResultDTO>>().ok(data);
     }
+    @Override
+    public Result<ItemDetailResultDTO> getItemDetailByWork(ItemDetailFormDTO formDto) {
+        ItemDetailResultDTO resultDTO = baseDao.selectOneOfItemDetailForWork(formDto);
+        return new Result<ItemDetailResultDTO>().ok(resultDTO);
+    }
+
 
     @Override
     public Result<ItemDetailResultDTO> getItemDetail(ItemDetailFormDTO formDto) {
@@ -355,6 +361,32 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
         return resultDTO;
     }
+    /**
+     * 工作端-获取可吹哨部门
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author: lipengfei
+     * @Date: 2019/11/19 16:34
+     */
+    @Override
+    public Result<List<ItemCirculationDeptResultDTO>> whistlingDept(){
+        // 可流转部门
+        Result<List<SysDeptDTO>> listResult = adminFeignClient.listOfItemCirculationDept(SecurityUser.getDeptId());
+        if (!listResult.success()) {
+            throw new RenException("获取流转协助部门失败");
+        }
+        List<SysDeptDTO> deptDTOS = listResult.getData();
+        // 初始化可流转部门-街道党工委：街道部门、区直部门
+        List<ItemCirculationDeptResultDTO> deptResultDTOS = new ArrayList<>();
+        for (SysDeptDTO dto :
+                deptDTOS) {
+            ItemCirculationDeptResultDTO circulationDeptResultDTO = new ItemCirculationDeptResultDTO();
+            circulationDeptResultDTO.setDeptId(dto.getId());
+            circulationDeptResultDTO.setDeptName(dto.getName());
+            circulationDeptResultDTO.setTypeKey(dto.getTypeKey());
+            deptResultDTOS.add(circulationDeptResultDTO);
+        }
+        return new Result<List<ItemCirculationDeptResultDTO>>().ok(deptResultDTOS);
+    }
 
     /**
      * 项目详情-街道党工委-可做操作和可流转部门

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -98,6 +98,9 @@
                 <if test='formDto.userId != null and formDto.userId != ""'>
                     AND t1.USER_ID = #{formDto.userId}
                 </if>
+                <if test='formDto.itemState != null '>
+                    AND t1.ITEM_STATE = #{formDto.itemState}
+                </if>
                 ORDER BY
                 <if test='formDto.orderType != null and formDto.orderType != "" and formDto.orderType == "1"'>
                     t1.LAST_HANDLE_TIME DESC
@@ -206,7 +209,10 @@
         <result property="userDislike" column="userDislike"/>
         <result property="content" column="ITEM_CONTENT"/>
         <result property="itemState" column="ITEM_STATE"/>
+        <result property="categoryName" column="CATEGORY_NAME"/>
+        <result property="distributeTime" column="DISTRIBUTE_TIME"/>
         <result property="createdTime" column="CREATED_TIME"/>
+        <result property="mobile" column="MOBILE"/>
         <result property="partyFlag" column="IS_PARTY_MEMBER"/>
         <result property="nickname" column="NICK_NAME"/>
         <result property="avatar" column="USER_FACE"/>
@@ -214,6 +220,8 @@
         <result property="browseNum" column="BROWSE_NUM"/>
         <result property="approveNum" column="APPROVE_NUM"/>
         <result property="opposeNum" column="OPPOSE_NUM"/>
+        <result property="commentNum" column="COMMENT_NUM"/>
+        <result property="statementNum" column="statementNum"/>
         <result property="categoryId" column="ISSUE_CATEGORY_ID"/>
         <result property="isOperational" column="isOperational"/>
         <result property="isSatisfactionEvaluation" column="isSatisfactionEvaluation"/>
@@ -399,6 +407,36 @@
             item.DEL_FLAG = '0'
             AND item.ID = #{itemId}
     </select>
+    <select id="selectOneOfItemDetailForWork" resultMap="itemDetailMap">
+        SELECT
+            item.ID,
+            item.NICK_NAME,
+            item.DISTRIBUTE_TIME,
+            item.MOBILE,
+            item.USER_FACE,
+            item.ITEM_CONTENT,
+            cate.CATEGORY_NAME,
+            item.IS_PARTY_MEMBER,
+            item.ISSUE_ADDRESS,
+            eve.APPROVE_NUM,
+            eve.OPPOSE_NUM,
+            eve.COMMENT_NUM,
+            eve.BROWSE_NUM,
+            ( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS statementNum,
+            item.EVENT_ID,
+            img.IMG_URL
+        FROM
+            epdc_item item
+            LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID
+            AND img.DEL_FLAG = '0'
+            LEFT JOIN epdc_event_category cate ON item.ISSUE_CATEGORY_ID = cate.ID
+	        AND cate.DEL_FLAG = '0'
+	        LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID
+            AND eve.DEL_FLAG = '0'
+        WHERE
+            item.DEL_FLAG = '0'
+            AND item.ID = #{itemId}
+    </select>
 
     <resultMap id="itemHandleMap" type="com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO">
         <result property="createdTime" column="createdTime"/>