北尚诉办-话术调整

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<ItemEvaluateDeptDTO> evaluateDeptDTOS;
+
     /**
      * 执法详情
      */

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<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.item.result.ItemAppealPageResultDTO>>
     */
-    // todo jackWang 补充满意度详情
     @GetMapping("getItemAppealPage")
     public Result<PageData<ItemAppealPageResultDTO>> getItemAppealPage(@RequestParam Map<String, Object> params){
         PageData<ItemAppealPageResultDTO> page = itemService.getItemAppealPage(params);
@@ -316,7 +315,6 @@ public class ItemController {
     * @params [id]
     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.item.result.ItemAppealPageResultDTO>>
     */
-    // todo jackWang 补充满意度详情
     @GetMapping("getItemAppealDetail/{id}")
     public Result<ItemAppealDetailResultDTO> getItemAppealDetail(@PathVariable("id") String id){
         return itemService.getItemAppealDetail(id);

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<ItemDao, ItemEntity> 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<ItemDao, ItemEntity> 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<ItemDao, ItemEntity> implem
             ItemLawEntity itemLaw = itemLawDao.selectOne(wrapper);
             result.setLawDetail(ConvertUtils.sourceToTarget(itemLaw, ItemAppealLawDetailResultDTO.class));
         }
+        // 满意度评价部门
+//        List<ItemEvaluateDeptDTO> evaluateDeptDTOS = itemDeptService.listOfEvaluateDepts(resultDTO.getId(), deptId);
+//        resultDTO.setEvaluateDeptDTOS(evaluateDeptDTOS);
         return new Result<ItemAppealDetailResultDTO>().ok(result);
     }