|
@@ -117,7 +117,7 @@ public class BenchmarkingService {
|
|
|
|
|
|
public List<ProBasicOrganizeEquipment> wtByWplist(String wpids) {
|
|
public List<ProBasicOrganizeEquipment> wtByWplist(String wpids) {
|
|
return CacheContext.organizeEquipmentList.stream().filter(
|
|
return CacheContext.organizeEquipmentList.stream().filter(
|
|
- oe -> wpids.contains(oe.getWindpowerstationId()) && (oe.getNemName().contains("逆变器") || oe.getNemName().contains("风机"))).collect(Collectors.toList());
|
|
|
|
|
|
+ oe -> wpids.contains(oe.getWindpowerstationId()) && !oe.getParentCode().endsWith("AG") && (oe.getNemName().contains("逆变器") || oe.getNemName().contains("风机"))).collect(Collectors.toList());
|
|
}
|
|
}
|
|
|
|
|
|
public List<ProBasicOrganizeEquipment> wtByWplistxin(String wpids) {
|
|
public List<ProBasicOrganizeEquipment> wtByWplistxin(String wpids) {
|