|
@@ -458,7 +458,7 @@ public class SpecificService {
|
|
|
}
|
|
|
});
|
|
|
}else {
|
|
|
- List<ProBasicPowerstation> wpls = benchmarkingService.wpByCplist(companys, type);
|
|
|
+ List<ProBasicOrganizeTree> wpls = benchmarkingService.wpByCplist(companys, type);
|
|
|
wpls.stream().forEach(wp->{
|
|
|
Optional<SpecificCenterVo> optionMonth = monthresultList.stream().filter(j -> j.getWpid().equals(wp.getId())).findFirst();
|
|
|
if (optionMonth.isPresent()){
|
|
@@ -534,7 +534,7 @@ public class SpecificService {
|
|
|
}
|
|
|
});
|
|
|
}else {
|
|
|
- List<ProBasicPowerstation> wpls = benchmarkingService.wpByCplist(companys, type);
|
|
|
+ List<ProBasicOrganizeTree> wpls = benchmarkingService.wpByCplist(companys, type);
|
|
|
wpls.stream().forEach(wp->{
|
|
|
Optional<SpecificCenterVo> optionMonth = yearresultList.stream().filter(j -> j.getWpid().equals(wp.getId())).findFirst();
|
|
|
if (optionMonth.isPresent()){
|
|
@@ -609,7 +609,7 @@ public class SpecificService {
|
|
|
monthresultList.add(leftVo);
|
|
|
});
|
|
|
}else {
|
|
|
- List<ProBasicPowerstation> wpls = benchmarkingService.wpByCplist(companys, type);
|
|
|
+ List<ProBasicOrganizeTree> wpls = benchmarkingService.wpByCplist(companys, type);
|
|
|
wpls.stream().forEach(i->{
|
|
|
SpecificCenterVo leftVo = new SpecificCenterVo();
|
|
|
leftVo.setWpid(i.getId());
|
|
@@ -681,7 +681,7 @@ public class SpecificService {
|
|
|
yearresultList.add(rightVo);
|
|
|
});
|
|
|
}else {
|
|
|
- List<ProBasicPowerstation> wpls = benchmarkingService.wpByCplist(companys, type);
|
|
|
+ List<ProBasicOrganizeTree> wpls = benchmarkingService.wpByCplist(companys, type);
|
|
|
wpls.stream().forEach(i->{
|
|
|
SpecificCenterVo rightVo = new SpecificCenterVo();
|
|
|
rightVo.setWpid(i.getId());
|