From 47ffb5c28c2819cfd46d3d8cf5e84e745cbbeb02 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 19 May 2022 10:48:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=BF=94=E5=8F=82=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/IcEventListResultDTO.java      | 34 ++++++++++++++-----
 .../epmet/controller/IcEventController.java   |  2 +-
 .../service/impl/IcEventServiceImpl.java      |  6 ++++
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java
index e5e6680ea8..feae9034b9 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java
@@ -41,14 +41,6 @@ public class IcEventListResultDTO implements Serializable {
      * 音频[url集合]
      */
     private List<String> voiceList;
-    /**
-     * 分类Id
-     */
-    private String categoryId;
-    /**
-     * 分类名称(医疗-二类名)
-     */
-    private String categoryName;
     /**
      * 上报渠道[字典表]
      */
@@ -100,6 +92,32 @@ public class IcEventListResultDTO implements Serializable {
      */
     private String createdUserId;
 
+    /**
+     * 上级分类ID 顶级此列存储0
+     */
+    private String parentCategoryId;
+    /**
+     * 分类Id
+     */
+    private String categoryId;
+    /**
+     * 上级分类编码
+     */
+    private String parentCategoryCode;
+
+    /**
+     * 分类编码
+     */
+    private String categoryCode;
+    /**
+     * 上级分类名称
+     */
+    private String parentCategoryName;
+    /**
+     * 分类名称
+     */
+    private String categoryName;
+
     /**
      * 事件附件
      */
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java
index 1540339644..2080575caf 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java
@@ -235,7 +235,7 @@ public class IcEventController {
 
     /**
      * @Author sun
-     * @Description 事件管理-评价
+     * @Description 事件管理-详情
      **/
     @PostMapping("detail")
     public Result<IcEventListResultDTO> detail(@RequestBody IcEventListFormDTO formDTO) {
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
index 5b8b5f69db..bcfb158e51 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
@@ -836,6 +836,12 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
                 CategoryTagResultDTO category = queryCategory(formDTO.getCustomerId(), categoryList);
                 for (IssueProjectCategoryDictDTO ca : category.getCategoryList()){
                     if (ca.getId().equals(resultDTO.getCategoryId())) {
+                        resultDTO.setParentCategoryId(ca.getPid());
+                        resultDTO.setCategoryId(ca.getId());
+                        resultDTO.setParentCategoryCode(ca.getParentCategoryCode());
+                        resultDTO.setCategoryCode(ca.getCategoryCode());
+                        resultDTO.setParentCategoryName(ca.getParentCategoryName());
+                        resultDTO.setCategoryName(ca.getCategoryName());
                         resultDTO.setCategoryName(ca.getParentCategoryName()+"-"+ca.getCategoryName());
                     }
                 }