k94314517
2024-04-12 7341852b4449d689a7320b4f345ad2a10e47951e
server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
@@ -1431,7 +1431,7 @@
            header2.createCell(5).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getStartTime()));
            header2.createCell(6).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getEndTime()));
            header2.createCell(7).setCellValue(data.getApplyChagneDetailList().stream().filter(i->i.getType().equals(Constants.TWO)).collect(Collectors.toList()).size());
            header2.createCell(8).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getApplyStartTime()));
            header2.createCell(8).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getValidTime()));
//            sheet.addMergedRegion(new CellRangeAddress(2  ,2,1,3));
            sheet.addMergedRegion(new CellRangeAddress(2  ,2,0,1));