|
@@ -799,27 +799,27 @@ public class BenchmarkingService {
|
|
|
|
|
|
if (type.equals(TYPE_WIND)) {
|
|
|
vo.setId(i.getWindpowerstationId());
|
|
|
- vo.setName(CacheContext.wpmap.get(i.getWindpowerstationId().trim()).getNemName());
|
|
|
+ vo.setName(CacheContext.wpmap.get(i.getWindpowerstationId().trim()).getAname());
|
|
|
vo.setOrdernum(station.get(i.getWindpowerstationId()).doubleValue());
|
|
|
} else if (type.equals(TYPE_PROJECT)) {
|
|
|
vo.setId(i.getProjectId());
|
|
|
- vo.setName(CacheContext.pjmap.get(i.getProjectId().trim()).getNemName());
|
|
|
+ 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)) {
|
|
|
vo.setId(i.getLineId());
|
|
|
- vo.setName(CacheContext.lnmap.get(i.getLineId().trim()).getNemName());
|
|
|
+ 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)) {
|
|
|
vo.setId(i.getWindturbineId());
|
|
|
- vo.setName(CacheContext.wtmap.get(i.getWindturbineId().trim()).getNemName());
|
|
|
+ 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)) {
|
|
|
vo.setId(i.getSquareId());
|
|
|
- vo.setName(CacheContext.proBasicOrganizeTreesMap.get(i.getSquareId()).getNemName());
|
|
|
+ vo.setName(CacheContext.proBasicOrganizeTreesMap.get(i.getSquareId()).getAname());
|
|
|
vo.setOrdernum(CacheContext.proBasicOrganizeTreesMap.get(i.getSquareId()).getOrderNum().doubleValue());
|
|
|
} else if (type.equals(TYPE_COMPANY)) {
|
|
|
vo.setId(i.getId());
|
|
|
- vo.setName(CacheContext.proBasicOrganizeTreesMap.get(i.getId()).getNemName());
|
|
|
+ vo.setName(CacheContext.proBasicOrganizeTreesMap.get(i.getId()).getAname());
|
|
|
vo.setOrdernum(CacheContext.proBasicOrganizeTreesMap.get(i.getId()).getOrderNum().doubleValue());
|
|
|
}
|
|
|
|