Merge remote-tracking branch 'origin/dev_add_closedCount_category' into develop

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;
 

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;
+
     /**
      * 分类名字
      */

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'

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" '>