From f1b791d24660d8f15835eae0bdf623688da0ff1f Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 5 Nov 2021 16:10:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9children?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/project/dto/result/ProjectCategoryResultDTO.java  | 2 +-
 .../evaluationindex/screen/impl/ScreenProjectServiceImpl.java   | 2 +-
 .../mapper/screen/ScreenProjectCategoryOrgDailyDao.xml          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 0bc575733e..2d986e5773 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
@@ -47,7 +47,7 @@ public class ProjectCategoryResultDTO implements Serializable {
      */
     private String closedRatio;
 
-    private List<ProjectCategorySonResultDTO> children;
+    private List<ProjectCategoryResultDTO> children;
 
     public ProjectCategoryResultDTO() {
         this.categoryCode = "";
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java
index 3a71dbb206..ffa534a03a 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java
@@ -316,7 +316,7 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
         // 排序
         List<ProjectCategoryResultDTO> collect = result.stream().sorted(Comparator.comparing(ProjectCategoryResultDTO::getProjectTotal).reversed()).collect(Collectors.toList());
         collect.forEach(c -> {
-            c.setChildren(c.getChildren().stream().sorted(Comparator.comparing(ProjectCategorySonResultDTO::getProjectTotal).reversed()).collect(Collectors.toList()));
+            c.setChildren(c.getChildren().stream().sorted(Comparator.comparing(ProjectCategoryResultDTO::getProjectTotal).reversed()).collect(Collectors.toList()));
         });
         return collect;
     }
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 28058a8904..96d06f7f93 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,7 +94,7 @@
     <resultMap id="selectCategoryByCustomerIdMap" type="com.epmet.project.dto.result.ProjectCategoryResultDTO">
         <result column="c" property="categoryCode"/>
         <result column="n" property="categoryName"/>
-        <collection property="children" ofType="com.epmet.project.dto.result.ProjectCategorySonResultDTO">
+        <collection property="children" ofType="com.epmet.project.dto.result.ProjectCategoryResultDTO">
             <result column="c2" property="categoryCode"/>
             <result column="n2" property="categoryName"/>
         </collection>