Browse Source

修改children

dev_shibei_match
zxc 4 years ago
parent
commit
f1b791d246
  1. 2
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryResultDTO.java
  2. 2
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java
  3. 2
      epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml

2
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 String closedRatio;
private List<ProjectCategorySonResultDTO> children; private List<ProjectCategoryResultDTO> children;
public ProjectCategoryResultDTO() { public ProjectCategoryResultDTO() {
this.categoryCode = ""; this.categoryCode = "";

2
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()); List<ProjectCategoryResultDTO> collect = result.stream().sorted(Comparator.comparing(ProjectCategoryResultDTO::getProjectTotal).reversed()).collect(Collectors.toList());
collect.forEach(c -> { 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; return collect;
} }

2
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"> <resultMap id="selectCategoryByCustomerIdMap" type="com.epmet.project.dto.result.ProjectCategoryResultDTO">
<result column="c" property="categoryCode"/> <result column="c" property="categoryCode"/>
<result column="n" property="categoryName"/> <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="c2" property="categoryCode"/>
<result column="n2" property="categoryName"/> <result column="n2" property="categoryName"/>
</collection> </collection>

Loading…
Cancel
Save