diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/config/PoiOutPage.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/config/PoiOutPage.java index 204907ab..061fb7c1 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/config/PoiOutPage.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/config/PoiOutPage.java @@ -230,7 +230,8 @@ public class PoiOutPage { rowNum = createDataRows(sheet, rowNum, result, contentStyle, list.size()); } else { // 如果没有数据,则仅显示表头 - rowNum++; +// rowNum++; + rowNum = createDataRows(sheet, rowNum, result, contentStyle, list.size()); } rowNum = createTotalRow(sheet, rowNum, list, totalCost, headerStyle); return workbook; @@ -269,26 +270,11 @@ public class PoiOutPage { rowNum = createDataRows(sheet, rowNum, resultLease, contentStyle, listLease.size()); } else { // 如果没有数据,则仅显示表头 - rowNum++; +// rowNum++; + rowNum = createDataRows(sheet, rowNum, resultLease, contentStyle, listLease.size()); } rowNum = createTotalRow(sheet, rowNum, listLease, totalCostLease, headerStyle); - /** - * 丢失费用明细 - */ - // 填充标题行 - rowNum = createTitleRowStyleCost(sheet, rowNum, "丢失费用明细", titleStyle, listLose.size()); - // 填充表头 - rowNum = createHeaderRow(sheet, rowNum, listLose, headerStyle); - // 填充数据行 - if (resultLose!= null &&!resultLose.isEmpty()) { - rowNum = createDataRows(sheet, rowNum, resultLose, contentStyle, listLose.size()); - } else { - // 如果没有数据,则仅显示表头 - rowNum++; - } - rowNum = createTotalRow(sheet, rowNum, listLose, totalCostLose, headerStyle); - /** * 维修费用明细 */ @@ -301,7 +287,8 @@ public class PoiOutPage { rowNum = createDataRows(sheet, rowNum, resultRepair, contentStyle, listRepair.size()); } else { // 如果没有数据,则仅显示表头 - rowNum++; +// rowNum++; + rowNum = createDataRows(sheet, rowNum, resultRepair, contentStyle, listRepair.size()); } rowNum = createTotalRow(sheet, rowNum, listRepair, totalCostRepair, headerStyle); @@ -317,10 +304,28 @@ public class PoiOutPage { rowNum = createDataRows(sheet, rowNum, resultScrap, contentStyle, listScrap.size()); } else { // 如果没有数据,则仅显示表头 - rowNum++; +// rowNum++; + rowNum = createDataRows(sheet, rowNum, resultScrap, contentStyle, listScrap.size()); } rowNum = createTotalRow(sheet, rowNum, listScrap, totalCostScrap, headerStyle); + /** + * 丢失费用明细 + */ + // 填充标题行 + rowNum = createTitleRowStyleCost(sheet, rowNum, "丢失费用明细", titleStyle, listLose.size()); + // 填充表头 + rowNum = createHeaderRow(sheet, rowNum, listLose, headerStyle); + // 填充数据行 + if (resultLose!= null &&!resultLose.isEmpty()) { + rowNum = createDataRows(sheet, rowNum, resultLose, contentStyle, listLose.size()); + } else { + // 如果没有数据,则仅显示表头 +// rowNum++; + rowNum = createDataRows(sheet, rowNum, resultLose, contentStyle, listLose.size()); + } + rowNum = createTotalRow(sheet, rowNum, listLose, totalCostLose, headerStyle); + //合计 BigDecimal totalCostAll = totalCostLease.add(totalCostLose).add(totalCostRepair).add(totalCostScrap); rowNum = createTotalRowAll(sheet, rowNum, listScrap, totalCostAll, headerStyle);