From eae981d109610b5f829cc23bace922129ffabffd Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 8 Nov 2021 14:25:54 +0800
Subject: [PATCH] mingzi

---
 .../epmet/project/dto/result/ProjectCategoryResultDTO.java   | 5 +++++
 .../mapper/screen/ScreenProjectCategoryOrgDailyDao.xml       | 1 +
 2 files changed, 6 insertions(+)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryResultDTO.java
index 379257551f..4d1a418b59 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryResultDTO.java
@@ -33,6 +33,11 @@ public class ProjectCategoryResultDTO implements Serializable {
      */
     private String categoryName;
 
+    /**
+     * 分类名字父级
+     */
+    private String parentCategoryName;
+
     /**
      * 项目总数
      */
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml
index f92fb1aade..b9dfb3faaa 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml
@@ -99,6 +99,7 @@
             <result column="c2" property="categoryCode"/>
             <result column="n2" property="categoryName"/>
             <result column="pc2" property="parentCategoryCode"/>
+            <result column="n" property="parentCategoryName"/>
         </collection>
     </resultMap>
     <select id="selectCategoryByCustomerId" resultMap="selectCategoryByCustomerIdMap">