From 94d7ca6d945ebd71d317fcd77d4cdb680964d15e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 20 May 2022 14:33:27 +0800
Subject: [PATCH] parentCategoryName

---
 .../mapper/IssueProjectCategoryDictDao.xml    | 18 ++++++++++-----
 .../epmet/dto/result/MyReportIcEvResDTO.java  | 13 +++++++++++
 .../service/impl/IcEventServiceImpl.java      | 23 +++++++++++++++----
 .../src/main/resources/mapper/IcEventDao.xml  |  7 +++++-
 4 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml
index f67db1aaa1..80ede5083f 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml
@@ -215,19 +215,25 @@
 
     <select id="getCategoryList" resultType="com.epmet.dto.IssueProjectCategoryDictDTO">
         SELECT
-            *
+            c.*,
+            (
+                case when p.CATEGORY_NAME is not null and p.CATEGORY_NAME !='' then CATEGORY_NAME
+                else ''
+                end
+            )as parentCategoryName
         FROM
-            issue_project_category_dict
+            issue_project_category_dict c
+        left join issue_project_category_dict p (c.PID=p.id)
         WHERE
-            del_flag = '0'
-        AND customer_id = #{customerId}
+            c.del_flag = '0'
+        AND c.customer_id = #{customerId}
         <if test="categoryIdList != null and categoryIdList.size() > 0">
             <foreach collection="categoryIdList" item="id" open="AND(  " separator=" OR " index="index" close=")">
-                id = #{id}
+                c.id = #{id}
             </foreach>
         </if>
         ORDER BY
-            sort ASC
+            c.sort ASC
     </select>
 
     <!-- 查询项目分类标签 -->
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyReportIcEvResDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyReportIcEvResDTO.java
index 7fb327037e..80a846cb4b 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyReportIcEvResDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyReportIcEvResDTO.java
@@ -88,6 +88,19 @@ public class MyReportIcEvResDTO implements Serializable {
      * 群众满意度[满意度 - 不满意:bad、基本满意:good、非常满意:perfect]
      */
     private String satisfactionName;
+
+    /**
+     * 分类Id
+     */
+    // @JsonIgnore
+    private String categoryId;
+
+    /**
+     * 分类名称
+     */
+    private String categoryName;
+
+
     /**
      * 事件附件
      */
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 6b81909bb6..3cd05b27d0 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
@@ -3,10 +3,7 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.constant.AppClientConstant;
-import com.epmet.commons.tools.constant.FieldConstant;
-import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.constant.*;
 import com.epmet.commons.tools.dto.form.FileCommonDTO;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.enums.DictTypeEnum;
@@ -1215,6 +1212,24 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
                     dto.setImageList(imageList);
                     dto.setVoiceList(voiceList);
                 }
+
+                //分类信息
+                if(StringUtils.isNotBlank(dto.getCategoryId())){
+                    List<String> categoryList = new ArrayList<>();
+                    categoryList.add(dto.getCategoryId());
+                    CategoryTagResultDTO category = queryCategory(formDTO.getCustomerId(), categoryList);
+                    for (IssueProjectCategoryDictDTO ca : category.getCategoryList()){
+                        if (ca.getId().equals(dto.getCategoryId())) {
+                            if(StringUtils.isNotBlank(ca.getParentCategoryName())){
+                                //大类-子类
+                                dto.setCategoryName(ca.getParentCategoryName().concat(StrConstant.HYPHEN).concat(ca.getCategoryName()));
+                            }else{
+                                dto.setCategoryName(ca.getCategoryName());
+                            }
+                        }
+                    }
+                }
+
             }
         }
         return new PageData<>(list, pageInfo.getTotal());
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
index 648177b3f9..72a5c10d19 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
@@ -295,6 +295,7 @@
         <result property="latestOperatedTime" column="latest_operated_time"></result>
         <result property="satisfaction" column="satisfaction"/>
         <result property="satisfactionName" column="satisfactionName" />
+        <result property="categoryId" column="category_id" />
         <collection property="attachmentList" ofType="com.epmet.dto.IcEventAttachmentDTO"
                     column="icEventId" select="com.epmet.dao.IcEventAttachmentDao.selectByIcEventId"/>
     </resultMap>
@@ -324,9 +325,13 @@
                 case when ie.status='processing' and ie.OPERATION_TYPE is not null and ie.OPERATION_TYPE ='0' then 1
                 else 0
                 end
-            )as reply_flag
+            )as reply_flag,
+            IFNULL(iec.category_id,'') AS category_id
         FROM
             ic_event ie
+        LEFT JOIN ic_event_category iec
+            ON(ie.id = iec.ic_event_id
+                AND iec.del_flag = '0')
         WHERE
             ie.del_flag = '0'
             and ie.customer_id = #{customerId}