git ch

k94314517

2024-07-30 d37bf55e27b7edb61037bccde6cabeda1ddec6b7

 server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java

@@ -1844,8 +1844,8 @@
            header1.createCell(4).setCellValue("保险生效止期");
            header1.createCell(5).setCellValue("加保人数");
            header1.createCell(6).setCellValue("减保人数");
            header1.createCell(7).setCellValue("批增生效日期");
            header1.createCell(8).setCellValue("批减生效日期");
            header1.createCell(7).setCellValue(Constants.getChangeApplyTimeTitle(1,data));
            header1.createCell(8).setCellValue(Constants.getChangeApplyTimeTitle(0,data));
            for (int i = 0; i < 9; i++) {
                configFirstCell(sxssfWorkbook,header1.getCell(i));
            }
@@ -2014,7 +2014,7 @@
            header1.createCell(5).setCellValue("保险生效起期");
            header1.createCell(6).setCellValue("保险生效止期");
            header1.createCell(7).setCellValue("换厂人数");
            header1.createCell(8).setCellValue("期望批单生效期");
            header1.createCell(8).setCellValue(Constants.getChangeApplyTimeTitle(2,data));

            sheet.addMergedRegion(new CellRangeAddress(1  ,1,0,1));
            sheet.addMergedRegion(new CellRangeAddress(1  ,1,2,3));