From c1a9fa040a76671cfde23d28218158496f7132aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Wed, 20 Nov 2019 12:07:37 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiWorkItemController.java | 68 +++++++++++++--- .../esua/epdc/feign/WorkItemFeignClient.java | 48 ++++++++++++ .../fallback/WorkItemFeignClientFallback.java | 23 ++++++ .../esua/epdc/service/WorkItemService.java | 49 +++++++++++- .../service/impl/WorkItemServiceImpl.java | 30 ++++++++ .../esua/epdc/dto/item/form/ItemFormDTO.java | 2 +- .../dto/item/result/ItemDetailResultDTO.java | 29 +++++++ .../item/controller/WorkItemController.java | 77 ++++++++++++++++++- .../esua/epdc/modules/item/dao/ItemDao.java | 9 +++ .../modules/item/service/ItemService.java | 23 ++++++ .../item/service/impl/ItemServiceImpl.java | 32 ++++++++ .../main/resources/mapper/item/ItemDao.xml | 38 +++++++++ 12 files changed, 414 insertions(+), 14 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java index 07c4c6093..90503fe29 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java +++ b/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 * @Author: lipengfei * @Date: 2019/11/18 13:26 */ @GetMapping("statistics") - public Result itemStatistics(ItemStatisticsFormDTO formDto) { + public Result 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> listItems(ItemFormDTO formDto) { + public Result> listItems(@RequestBody ItemFormDTO formDto) { return workItemService.listItems( formDto); } + /** + * 项目详情 + * @Params: [id] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: lipengfei + * @Date: 2019/11/19 16:34 + */ + @GetMapping("detail/{id}") + public Result 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> 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> 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> evaluationDept(@RequestBody EvaluationFormDTO evaluationFormDTO) { + return workItemService.evaluationDept(evaluationFormDTO); + } + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java index 68503bf71..11c432368 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java +++ b/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> listItems(ItemFormDTO formDto); + /** + * 项目详情 + * @Params: [formDto] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: lipengfei + * @Date: 2019/11/19 16:42 + */ + @GetMapping(value = "events/work/item/detail", consumes = MediaType.APPLICATION_JSON_VALUE) + Result 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> 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> 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> evaluationDept(EvaluationFormDTO evaluationFormDTO); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkItemFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkItemFeignClientFallback.java index 96f01beed..eddfcd668 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkItemFeignClientFallback.java +++ b/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> listItems(ItemFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "listItems", formDto); } + @Override + public Result getItemDetail(ItemDetailFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "getItemDetail", formDto); + } + + @Override + public Result> evaluation(EvaluationFormDTO evaluationFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "evaluation", evaluationFormDTO); + } + @Override + public Result> 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> evaluationDept(EvaluationFormDTO evaluationFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "evaluationDept", evaluationFormDTO); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java index 7b7bb772e..9c2c95e9c 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java +++ b/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> listItems(ItemFormDTO formDto); + /** + * 项目详情 + * @Params: [userDetail, itemId] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: lipengfei + * @Date: 2019/11/19 16:34 + */ + Result getItemDetail(String itemId); + /** + * 获取满意度评价结果 + * @Params: [evaluationFormDTO] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: lipengfei + * @Date: 2019/11/19 16:34 + */ + Result> evaluation(EvaluationFormDTO evaluationFormDTO); + /** + * 获取可吹哨部门 + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: lipengfei + * @Date: 2019/11/19 16:34 + */ + Result> 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> evaluationDept(EvaluationFormDTO evaluationFormDTO); + + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java index 2677ff77f..cf26abc79 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java +++ b/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 getItemDetail(String itemId) { + ItemDetailFormDTO formDto = new ItemDetailFormDTO(); + formDto.setItemId(itemId); + return workItemFeignClient.getItemDetail(formDto); + } + + + @Override + public Result> evaluation(EvaluationFormDTO evaluationFormDTO) { + return workItemFeignClient.evaluation(evaluationFormDTO); + } + @Override + public Result> whistlingDept() { + return workItemFeignClient.whistlingDept(); + } + + @Override + public Result handleSubmit(ItemHandleSubmitFormDTO dto) { + + return workItemFeignClient.handleSubmit(dto); + } + + @Override + public Result> evaluationDept(EvaluationFormDTO evaluationFormDTO) { + return workItemFeignClient.evaluationDept(evaluationFormDTO); + } + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemFormDTO.java index a251c3ead..a383808d4 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemFormDTO.java +++ b/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; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java index 919ee7092..c240b2ca4 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java +++ b/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 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java index 3defd7432..04c944a25 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java +++ b/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 + * @Author: lipengfei + * @Date: 2019/11/19 16:46 + */ + @GetMapping("detail") + public Result 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> evaluation(@RequestBody EvaluationFormDTO evaluationFormDTO) { + //略过FormDto不相关检验 + evaluationFormDTO.setEvaluationContent(" "); + ValidatorUtils.validateEntity(evaluationFormDTO); + List deptEvaluateResultDTOS = itemEvaluateDeptService.listOfDeptEvaluateByItemId(evaluationFormDTO.getItemId()); + return new Result>().ok(deptEvaluateResultDTOS); + } + /** + * 工作端-获取可吹哨部门 + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: lipengfei + * @Date: 2019/11/19 16:34 + */ + @GetMapping("whistlingDept") + public Result> 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> evaluationDept(@RequestBody EvaluationFormDTO evaluationFormDTO) { + //略过FormDto不相关检验 + evaluationFormDTO.setEvaluationContent(" "); + ValidatorUtils.validateEntity(evaluationFormDTO); + List evaluateDeptDTOS = itemDeptService.listOfEvaluateDepts(evaluationFormDTO.getItemId(), SecurityUser.getDeptId()); + return new Result>().ok(evaluateDeptDTOS); + } +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index dd09be3ad..88699f0bc 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/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 { * @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); + /** * 移动端-议题分类统计 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index 89bde0c69..41167303f 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/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 { */ Result getItemDetail(ItemDetailFormDTO formDto); + /** + * 工作端-项目详情 + * @Params: [formDto] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: lipengfei + * @Date: 2019/9/10 20:54 + */ + Result getItemDetailByWork(ItemDetailFormDTO formDto); + + /** + * 工作端-获取满意度评价结果 + * @Params: [evaluationFormDTO] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> whistlingDept(); /** * 项目分类统计 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 8243785a1..15cee4ed8 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 @@ -207,6 +207,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem List data = baseDao.selectListOfItems(formDto, states); return new Result>().ok(data); } + @Override + public Result getItemDetailByWork(ItemDetailFormDTO formDto) { + ItemDetailResultDTO resultDTO = baseDao.selectOneOfItemDetailForWork(formDto); + return new Result().ok(resultDTO); + } + @Override public Result getItemDetail(ItemDetailFormDTO formDto) { @@ -355,6 +361,32 @@ public class ItemServiceImpl extends BaseServiceImpl implem return resultDTO; } + /** + * 工作端-获取可吹哨部门 + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: lipengfei + * @Date: 2019/11/19 16:34 + */ + @Override + public Result> whistlingDept(){ + // 可流转部门 + Result> listResult = adminFeignClient.listOfItemCirculationDept(SecurityUser.getDeptId()); + if (!listResult.success()) { + throw new RenException("获取流转协助部门失败"); + } + List deptDTOS = listResult.getData(); + // 初始化可流转部门-街道党工委：街道部门、区直部门 + List 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>().ok(deptResultDTOS); + } /** * 项目详情-街道党工委-可做操作和可流转部门 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 80e7b4be5..cd375a733 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 @@ -98,6 +98,9 @@ AND t1.USER_ID = #{formDto.userId} + + AND t1.ITEM_STATE = #{formDto.itemState} + ORDER BY t1.LAST_HANDLE_TIME DESC @@ -206,7 +209,10 @@ + + + @@ -214,6 +220,8 @@ + + @@ -399,6 +407,36 @@ item.DEL_FLAG = '0' AND item.ID = #{itemId} +