gleimar 2015-06-24 21:15:59 +00:00
parent 0ea623d5e9
commit 3b1a560fc7
1 changed files with 8 additions and 4 deletions

View File

@ -458,16 +458,16 @@ public class ModificacionMasivaTarifasController extends MyGenericForwardCompose
row.createCell(7).setCellValue(sfFormatada.format(dataIni) + " - " + sfFormatada.format(dataFim)); row.createCell(7).setCellValue(sfFormatada.format(dataIni) + " - " + sfFormatada.format(dataFim));
row.createCell(8).setCellValue(obj[9].toString()); row.createCell(8).setCellValue(obj[9].toString());
String ori = obj[10].toString(); String ori = getStringImporteSafe(obj[10]);
BigDecimal original = BigDecimal.valueOf(Double.valueOf(ori)); BigDecimal original = BigDecimal.valueOf(Double.valueOf(ori));
String atu = obj[11].toString(); String atu = getStringImporteSafe(obj[11]);
BigDecimal atual = BigDecimal.valueOf(Double.valueOf(atu)); BigDecimal atual = BigDecimal.valueOf(Double.valueOf(atu));
row.createCell(9).setCellValue(original.setScale(2).doubleValue()); row.createCell(9).setCellValue(original.setScale(2).doubleValue());
row.createCell(10).setCellValue(atual.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)); BigDecimal pedVal = BigDecimal.valueOf(Double.valueOf(ped));
row.createCell(12).setCellValue(pedVal.setScale(2).doubleValue()); row.createCell(12).setCellValue(pedVal.setScale(2).doubleValue());
@ -483,7 +483,7 @@ public class ModificacionMasivaTarifasController extends MyGenericForwardCompose
continue; continue;
} }
novoPrecio = BigDecimal.valueOf(Double.valueOf(obj[16].toString())); novoPrecio = BigDecimal.valueOf(Double.valueOf(getStringImporteSafe(obj[16])));
celulaAlterada = 13; celulaAlterada = 13;
} }
@ -522,6 +522,10 @@ public class ModificacionMasivaTarifasController extends MyGenericForwardCompose
} }
} }
private String getStringImporteSafe(Object o) {
return ((o == null)?"0.0":o.toString());
}
// Escala // Escala
public VigenciaTarifa vigenciaTarifa(Media mExcel) throws IOException { public VigenciaTarifa vigenciaTarifa(Media mExcel) throws IOException {
InputStream isMExcel = mExcel.getStreamData(); InputStream isMExcel = mExcel.getStreamData();