|
@@ -123,9 +123,9 @@ public class FormulaMileage implements FormulaStrategy {
|
|
|
public void forG10(List<Mileage> data,TableElementConverter tec){
|
|
|
if(Func.isNotEmpty(data)){
|
|
|
Map<String,Object> g10 = (Map<String, Object>) tec.getConstantMap().computeIfAbsent("G10", k->new HashMap<>());
|
|
|
- g10.put("dx",data.stream().map(Mileage::getDx).collect(Collectors.toList()));
|
|
|
- g10.put("dxnv",data.stream().filter(e->!e.getVertical()).map(Mileage::getDx).collect(Collectors.toList()));
|
|
|
- g10.put("dxv",data.stream().filter(Mileage::getVertical).map(Mileage::getDx).collect(Collectors.toList()));
|
|
|
+ g10.put("dx",data.stream().map(Mileage::getDs).collect(Collectors.toList()));
|
|
|
+ g10.put("dxnv",data.stream().filter(e->!e.getVertical()).map(Mileage::getDs).collect(Collectors.toList()));
|
|
|
+ g10.put("dxv",data.stream().filter(Mileage::getVertical).map(Mileage::getDs).collect(Collectors.toList()));
|
|
|
}
|
|
|
}
|
|
|
|