fixes bug#6408
git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@45373 d1611594-4594-4d17-8e1d-87c2c4800839master
parent
0ea623d5e9
commit
3b1a560fc7
|
@ -458,16 +458,16 @@ public class ModificacionMasivaTarifasController extends MyGenericForwardCompose
|
|||
row.createCell(7).setCellValue(sfFormatada.format(dataIni) + " - " + sfFormatada.format(dataFim));
|
||||
row.createCell(8).setCellValue(obj[9].toString());
|
||||
|
||||
String ori = obj[10].toString();
|
||||
String ori = getStringImporteSafe(obj[10]);
|
||||
BigDecimal original = BigDecimal.valueOf(Double.valueOf(ori));
|
||||
|
||||
String atu = obj[11].toString();
|
||||
String atu = getStringImporteSafe(obj[11]);
|
||||
BigDecimal atual = BigDecimal.valueOf(Double.valueOf(atu));
|
||||
|
||||
row.createCell(9).setCellValue(original.setScale(2).doubleValue());
|
||||
row.createCell(10).setCellValue(atual.setScale(2).doubleValue());
|
||||
|
||||
String ped = obj[16] != null ? obj[16].toString() : "0.0";
|
||||
String ped = getStringImporteSafe(obj[16]);
|
||||
BigDecimal pedVal = BigDecimal.valueOf(Double.valueOf(ped));
|
||||
row.createCell(12).setCellValue(pedVal.setScale(2).doubleValue());
|
||||
|
||||
|
@ -483,7 +483,7 @@ public class ModificacionMasivaTarifasController extends MyGenericForwardCompose
|
|||
continue;
|
||||
}
|
||||
|
||||
novoPrecio = BigDecimal.valueOf(Double.valueOf(obj[16].toString()));
|
||||
novoPrecio = BigDecimal.valueOf(Double.valueOf(getStringImporteSafe(obj[16])));
|
||||
celulaAlterada = 13;
|
||||
}
|
||||
|
||||
|
@ -522,6 +522,10 @@ public class ModificacionMasivaTarifasController extends MyGenericForwardCompose
|
|||
}
|
||||
}
|
||||
|
||||
private String getStringImporteSafe(Object o) {
|
||||
return ((o == null)?"0.0":o.toString());
|
||||
}
|
||||
|
||||
// Escala
|
||||
public VigenciaTarifa vigenciaTarifa(Media mExcel) throws IOException {
|
||||
InputStream isMExcel = mExcel.getStreamData();
|
||||
|
|
Loading…
Reference in New Issue