|
@@ -145,7 +145,13 @@ public class ExportUtil {
|
|
|
}else {
|
|
|
cell=row.getCell(12);
|
|
|
}
|
|
|
- cell.setCellValue(schedule.getActualTotalFee());
|
|
|
+ String actualTotalFee = schedule.getActualTotalFee();
|
|
|
+ if (null == actualTotalFee || "".equals(actualTotalFee)) {
|
|
|
+ actualTotalFee = "0.0";
|
|
|
+ }
|
|
|
+ BigDecimal actual = new BigDecimal(actualTotalFee);
|
|
|
+ BigDecimal subtract = actual.subtract(mul);
|
|
|
+ cell.setCellValue(subtract.toString());
|
|
|
cell.setCellStyle(cellStyle);
|
|
|
if (i==scheduleList.size()-1){ cell.setCellStyle(cellStyleFont); }
|
|
|
if (row.getCell(13)==null){
|
|
@@ -153,7 +159,13 @@ public class ExportUtil {
|
|
|
}else {
|
|
|
cell=row.getCell(13);
|
|
|
}
|
|
|
- cell.setCellValue(schedule.getAddSubtractionLines());
|
|
|
+ String addSubtractionLines = schedule.getAddSubtractionLines();
|
|
|
+ if (null == addSubtractionLines || "".equals(addSubtractionLines)) {
|
|
|
+ addSubtractionLines = "0.0";
|
|
|
+ }
|
|
|
+ BigDecimal addSub = new BigDecimal(addSubtractionLines);
|
|
|
+ BigDecimal decimal = addSub.subtract(mul);
|
|
|
+ cell.setCellValue(decimal.toString());
|
|
|
cell.setCellStyle(cellStyle);
|
|
|
if (i==scheduleList.size()-1){ cell.setCellStyle(cellStyleFont); }
|
|
|
if (row.getCell(14)==null){
|