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

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerGridDTO.java

@@ -123,4 +123,9 @@ public class CustomerGridDTO implements Serializable {
      * 所有上级组织名
      */
     private String allParentName;
+
+    /**
+     * 组织-网格
+     */
+    private String gridNamePath;
 }

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 = "";

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;
     }

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>