王子文 月报 导出

master/src/main/java/com/ruoyi/project/production/service/impl/TMonthlyProductionReportServiceImpl.java

@@ -3199,15 +3199,6 @@ public class TMonthlyProductionReportServiceImpl implements ITMonthlyProductionR
         XSSFCellStyle styleYellow = wb.createCellStyle();
         styleYellow.setFillPattern(FillPatternType.SOLID_FOREGROUND);
         styleYellow.setFillForegroundColor(IndexedColors.YELLOW1.getIndex());
-        styleYellow.setBorderBottom(BorderStyle.THIN);
-        styleYellow.setBorderLeft(BorderStyle.THIN);
-        styleYellow.setBorderRight(BorderStyle.THIN);
-        styleYellow.setBorderTop(BorderStyle.THIN);
-        XSSFCellStyle styleWhite = wb.createCellStyle();
-        styleWhite.setBorderBottom(BorderStyle.THIN);
-        styleWhite.setBorderLeft(BorderStyle.THIN);
-        styleWhite.setBorderRight(BorderStyle.THIN);
-        styleWhite.setBorderTop(BorderStyle.THIN);
         // 行数
         int rowNum = 21 * 2 + crackerRawMaterial.size() + crackerOutputProduct.size() + aromaticsRawMaterial.size()
                 + aromaticsOutputProduct.size() + eligibleProductRate.size() + productYield.size()
@@ -3229,7 +3220,6 @@ public class TMonthlyProductionReportServiceImpl implements ITMonthlyProductionR
                     cell.setCellStyle(styleYellow);
                 } else {    // 非表头行
                     Cell cell = row.createCell(j);
-                    cell.setCellStyle(styleWhite);
                 }
             }
         }
@@ -3370,8 +3360,6 @@ public class TMonthlyProductionReportServiceImpl implements ITMonthlyProductionR
      * @return 当前行数
      */
     private int setTableHearder(XSSFSheet sheet, int rowCount, String header, int headerType) {
-        // 合并单元格
-        sheet.addMergedRegion(new CellRangeAddress(rowCount,rowCount,0,16));
         XSSFRow row0 = sheet.getRow(rowCount);
         row0.getCell(0).setCellValue(header);
         rowCount++;