同步

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/bmk/BenchmarkingService.java

@@ -729,31 +729,37 @@ public class BenchmarkingService {
                 .stream().collect(Collectors.toMap(ProBasicOrganizeTree::getId, ProBasicOrganizeTree::getOrderNum));
 
         List<ProEconEquipmentInfoDay1> list = proEconEquipmentInfoDay1Service.list(qw);
-        list = list.stream().filter(a -> a.getSquareId() != null).collect(Collectors.toList());
-        list.stream().forEach(i -> {
+        //list = list.stream().filter(a -> a.getSquareId() != null).collect(Collectors.toList());
+        for (ProEconEquipmentInfoDay1 i : list) {
             WxsslVo vo = new WxsslVo();
 
             if (type.equals(TYPE_WIND)) {
+                list = list.stream().filter(a -> a.getWindpowerstationId() != null).collect(Collectors.toList());
                 vo.setId(i.getWindpowerstationId());
                 vo.setName(CacheContext.wpmap.get(i.getWindpowerstationId().trim()).getAname());
                 vo.setOrdernum(station.get(i.getWindpowerstationId()).doubleValue());
             } else if (type.equals(TYPE_PROJECT)) {
+                list = list.stream().filter(a -> a.getProjectId() != null).collect(Collectors.toList());
                 vo.setId(i.getProjectId());
                 vo.setName(CacheContext.pjmap.get(i.getProjectId().trim()).getAname());
                 vo.setOrdernum(CacheContext.pjmap.get(i.getProjectId().trim()).getOrderNum().doubleValue());
             } else if (type.equals(TYPE_LINE)) {
+                list = list.stream().filter(a -> a.getLineId() != null).collect(Collectors.toList());
                 vo.setId(i.getLineId());
                 vo.setName(CacheContext.lnmap.get(i.getLineId().trim()).getAname());
                 vo.setOrdernum(CacheContext.lnmap.get(i.getLineId().trim()).getOrderNum().doubleValue());
             } else if (type.equals(TYPE_WINDTURBINE)) {
+                list = list.stream().filter(a -> a.getWindturbineId() != null).collect(Collectors.toList());
                 vo.setId(i.getWindturbineId());
                 vo.setName(CacheContext.wtmap.get(i.getWindturbineId().trim()).getAname());
                 vo.setOrdernum(CacheContext.wtmap.get(i.getWindturbineId().trim()).getOrderNum().doubleValue());
             } else if (type.equals(TYPE_SQUARE)) {
+                list = list.stream().filter(a -> a.getSquareId() != null).collect(Collectors.toList());
                 vo.setId(i.getSquareId());
                 vo.setName(CacheContext.proBasicOrganizeTreesMap.get(i.getSquareId()).getAname());
                 vo.setOrdernum(CacheContext.proBasicOrganizeTreesMap.get(i.getSquareId()).getOrderNum().doubleValue());
             } else if (type.equals(TYPE_COMPANY)) {
+                list = list.stream().filter(a -> a.getId() != null).collect(Collectors.toList());
                 vo.setId(i.getId());
                 vo.setName(CacheContext.proBasicOrganizeTreesMap.get(i.getId()).getAname());
                 vo.setOrdernum(CacheContext.proBasicOrganizeTreesMap.get(i.getId()).getOrderNum().doubleValue());
@@ -774,7 +780,7 @@ public class BenchmarkingService {
             vo.setXnssl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getXnssdl() / vo.getLlfdl() * 100, 2) : 0);
             vo.setSlssl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getSlssdl() / vo.getLlfdl() * 100, 2) : 0);
             resultList.add(vo);
-        });
+        }
         SortUtils.sort(resultList, "llfdl", SortUtils.DESC);
         for (int i = 0; i < resultList.size(); i++) {
             resultList.get(i).setZhpm(i + 1);