From 57da97a140a3f9a876bd99e767182951a2a62d09 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 7 Sep 2022 21:54:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-=E8=AF=9D?= =?UTF-8?q?=E6=9C=AF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/result/ItemAppealDetailResultDTO.java | 6 ++++++ .../modules/item/controller/ItemController.java | 2 -- .../item/service/impl/ItemServiceImpl.java | 16 +++++++--------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealDetailResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealDetailResultDTO.java index f61a85d4a..d6eb2a0e6 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealDetailResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealDetailResultDTO.java @@ -1,5 +1,6 @@ package com.elink.esua.epdc.dto.item.result; +import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; import lombok.Data; import java.io.Serializable; @@ -106,6 +107,11 @@ public class ItemAppealDetailResultDTO implements Serializable { */ private String evaluationTime; + /** + * 满意度评价部门 + */ + private List evaluateDeptDTOS; + /** * 执法详情 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java index 7ab817467..324083630 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java @@ -302,7 +302,6 @@ public class ItemController { * @params [dto] * @return com.elink.esua.epdc.commons.tools.utils.Result> */ - // todo jackWang 补充满意度详情 @GetMapping("getItemAppealPage") public Result> getItemAppealPage(@RequestParam Map params){ PageData page = itemService.getItemAppealPage(params); @@ -316,7 +315,6 @@ public class ItemController { * @params [id] * @return com.elink.esua.epdc.commons.tools.utils.Result> */ - // todo jackWang 补充满意度详情 @GetMapping("getItemAppealDetail/{id}") public Result getItemAppealDetail(@PathVariable("id") String id){ return itemService.getItemAppealDetail(id); 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 98374bffb..9f3b3e786 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 @@ -364,8 +364,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem ItemHandleProcessEntity itemHandleProcessEntity = new ItemHandleProcessEntity(); itemHandleProcessEntity.setItemId(itemEntity.getId()); itemHandleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_GRID_TOP.getValue()); - itemHandleProcessEntity.setHandleAdvice("您的诉求已收到。"); - itemHandleProcessEntity.setOutHandleAdvice("您的诉求已收到。"); + itemHandleProcessEntity.setHandleAdvice("诉求已查收，正在办理。"); + itemHandleProcessEntity.setOutHandleAdvice("诉求已查收，正在办理。"); itemHandleProcessEntity.setHandlerDeptId(itemEntity.getGridId()); itemHandleProcessEntity.setHandlerDept(itemEntity.getGrid()); itemHandleProcessService.insert(itemHandleProcessEntity); @@ -2330,13 +2330,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem ItemHandleProcessEntity itemHandleProcessEntity = new ItemHandleProcessEntity(); itemHandleProcessEntity.setItemId(entity.getId()); itemHandleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_GRID_TOP.getValue()); - if("0".equals(formDto.getPeopleFlag())){ - itemHandleProcessEntity.setHandleAdvice("您的诉求已收到，"+entity.getGrid()+"正在办理。"); - itemHandleProcessEntity.setOutHandleAdvice("您的诉求已收到，"+entity.getGrid()+"正在办理。"); - }else{ - itemHandleProcessEntity.setHandleAdvice("您的诉求已收到。"); - itemHandleProcessEntity.setOutHandleAdvice("您的诉求已收到。"); - } + itemHandleProcessEntity.setHandleAdvice("诉求已查收，正在办理。"); + itemHandleProcessEntity.setOutHandleAdvice("诉求已查收，正在办理。"); itemHandleProcessEntity.setHandlerDeptId(entity.getGridId()); itemHandleProcessEntity.setHandlerDept(entity.getGrid()); itemHandleProcessService.insert(itemHandleProcessEntity); @@ -2442,6 +2437,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem ItemLawEntity itemLaw = itemLawDao.selectOne(wrapper); result.setLawDetail(ConvertUtils.sourceToTarget(itemLaw, ItemAppealLawDetailResultDTO.class)); } + // 满意度评价部门 +// List evaluateDeptDTOS = itemDeptService.listOfEvaluateDepts(resultDTO.getId(), deptId); +// resultDTO.setEvaluateDeptDTOS(evaluateDeptDTOS); return new Result().ok(result); }