From 2bbecd100540b512f319c940b3a47ff2cfe4bebd Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 8 Nov 2021 13:26:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/CategoryProjectListResultDTO.java  | 15 +++++++++++++++
 .../mapper/screen/ScreenProjectDataDao.xml        |  5 ++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/CategoryProjectListResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/CategoryProjectListResultDTO.java
index c1e191b8bb..5250826a3c 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/CategoryProjectListResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/CategoryProjectListResultDTO.java
@@ -45,6 +45,21 @@ public class CategoryProjectListResultDTO implements Serializable {
      */
     private String projectId;
 
+    /**
+     * 上报人
+     */
+    private String linkName;
+
+    /**
+     * 上报人电话
+     */
+    private String linkMobile;
+
+    /**
+     * 事件地址
+     */
+    private String projectAddress;
+
     @JsonIgnore
     private String orgId;
 
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
index 27681bacad..accf6111e4 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
@@ -168,7 +168,10 @@
             DATE_FORMAT(PROJECT_CREATE_TIME,'%Y-%m-%d %h:%i:%s') AS createTime,
             ORG_ID,
             ORG_TYPE,
-            PROJECT_ID
+            PROJECT_ID,
+            LINK_NAME,
+            LINK_MOBILE,
+            PROJECT_ADDRESS
         FROM screen_project_data
         WHERE DEL_FLAG = '0'
           <if test=' status == "closed" '>

From ba7c4b141093653a0f5d3646d7068f032eefdf47 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 8 Nov 2021 13:38:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=88=B6=E7=BA=A7parentC?=
 =?UTF-8?q?ode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 f94fe8cb40..379257551f 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
@@ -23,6 +23,11 @@ public class ProjectCategoryResultDTO implements Serializable {
      */
     private String categoryCode;
 
+    /**
+     * 分类code父级
+     */
+    private String parentCategoryCode;
+
     /**
      * 分类名字
      */
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 96d06f7f93..f92fb1aade 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
@@ -94,9 +94,11 @@
     <resultMap id="selectCategoryByCustomerIdMap" type="com.epmet.project.dto.result.ProjectCategoryResultDTO">
         <result column="c" property="categoryCode"/>
         <result column="n" property="categoryName"/>
+        <result column="pc1" property="parentCategoryCode"/>
         <collection property="children" ofType="com.epmet.project.dto.result.ProjectCategoryResultDTO">
             <result column="c2" property="categoryCode"/>
             <result column="n2" property="categoryName"/>
+            <result column="pc2" property="parentCategoryCode"/>
         </collection>
     </resultMap>
     <select id="selectCategoryByCustomerId" resultMap="selectCategoryByCustomerIdMap">
@@ -104,7 +106,9 @@
             p1.CATEGORY_CODE AS c,
             p2.CATEGORY_CODE AS c2,
             p1.CATEGORY_NAME AS n,
-            p2.CATEGORY_NAME AS n2
+            p2.CATEGORY_NAME AS n2,
+            p1.PARENT_CATEGORY_CODE AS pc1,
+            p2.PARENT_CATEGORY_CODE AS pc2
         FROM customer_project_category_dict p1,customer_project_category_dict p2
         WHERE p1.DEL_FLAG = '0'
           AND p2.DEL_FLAG = '0'