|
@@ -926,13 +926,15 @@ public class BenchmarkingService {
|
|
|
} else {
|
|
|
SortUtils.sort(resultList, "ordernum", SortUtils.ASC);
|
|
|
}
|
|
|
- wxsslVoList = wxsslVoList.stream().filter(wv -> {
|
|
|
- boolean b = false;
|
|
|
- if(StringUtils.isNotEmpty(wv.getName())){
|
|
|
- b = wv.getName().contains("逆变器") || wv.getName().contains("风机");
|
|
|
- }
|
|
|
- return b;
|
|
|
- }).collect(Collectors.toList());
|
|
|
+ if (!id.endsWith("ZGS")) {
|
|
|
+ wxsslVoList = wxsslVoList.stream().filter(wv -> {
|
|
|
+ boolean b = false;
|
|
|
+ if (StringUtils.isNotEmpty(wv.getName())) {
|
|
|
+ b = wv.getName().contains("逆变器") || wv.getName().contains("风机");
|
|
|
+ }
|
|
|
+ return b;
|
|
|
+ }).collect(Collectors.toList());
|
|
|
+ }
|
|
|
return wxsslVoList;
|
|
|
}
|
|
|
|