|
@@ -366,13 +366,13 @@ public class EconomicService {
|
|
|
if (wpids.contains(wt1.getWindpowerstationId()) && windturbineids.contains(wt1.getWindturbineId())) {
|
|
|
EconomicVo vo1 = new EconomicVo();
|
|
|
vo1.setId(wt1.getWindturbineId());
|
|
|
- vo1.setName(wt1.getNemName());
|
|
|
+ vo1.setName(wt1.getAname());
|
|
|
wt.add(vo1);
|
|
|
}
|
|
|
} else if (wpids.isEmpty() && companys.contains("RGN")) {
|
|
|
EconomicVo vo1 = new EconomicVo();
|
|
|
vo1.setId(wt1.getWindturbineId());
|
|
|
- vo1.setName(wt1.getNemName());
|
|
|
+ vo1.setName(wt1.getAname());
|
|
|
wt.add(vo1);
|
|
|
}
|
|
|
}
|