|
@@ -476,8 +476,12 @@ public class EquipmentPerformaCompareService {
|
|
|
vo.setWtid(i.getWindturbineId());
|
|
|
vo.setNemCode(CacheContext.wtmap.get(i.getWindturbineId()).getAname());
|
|
|
Optional<ProEconWtwindDayInfo> first = fzyList.stream().filter(fzy -> fzy.getWindturbineId().equals(i.getWindturbineId())).findFirst();
|
|
|
+ List<FzyVo> vos = new ArrayList<>();
|
|
|
if (first.isPresent()){
|
|
|
- List<FzyVo> vos = getFzyVos(first,dateType);
|
|
|
+ vos = getFzyVos(first,dateType);
|
|
|
+ vo.setJfpl(first.get().getCb());
|
|
|
+ }
|
|
|
+
|
|
|
switch (dateType){
|
|
|
case "1" :
|
|
|
vo.setFdl(i.getRfdl());
|
|
@@ -548,8 +552,7 @@ public class EquipmentPerformaCompareService {
|
|
|
|
|
|
}
|
|
|
vo.setFzyList(vos);
|
|
|
- vo.setJfpl(first.get().getCb());
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
resultList.add(vo);
|
|
|
});
|