|
@@ -46,9 +46,11 @@ public class ProEconEquipmentInfoDayTopServiceImpl extends ServiceImpl<ProEconEq
|
|
|
String finalType = staType.equals("-1") ? "_FDC" : "_GDC";
|
|
|
wplist = wplist.stream().filter(wp -> wp.getId().indexOf(finalType) >= 0).collect(Collectors.toList());
|
|
|
}
|
|
|
- wpids = wplist.stream().map(ProBasicPowerstation::getId).collect(Collectors.toList());
|
|
|
+
|
|
|
if (StringUtils.isNotEmpty(windpowerstationId)) {
|
|
|
wpids.add(windpowerstationId);
|
|
|
+ }else {
|
|
|
+ wpids = wplist.stream().map(ProBasicPowerstation::getId).collect(Collectors.toList());
|
|
|
}
|
|
|
|
|
|
//匹配场站条件
|