Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

rk

4 天以前 8c4dfb07d551ceb372887ff8f22bd1f574d0347b

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

@@ -447,16 +447,19 @@
                List<String> rowList = dataList.get(i);
                for (int j = 0; j < rowList.size(); j++) {
                    Cell cell = row.createCell(j);
                    if(i==0&&j==0){
                        cell.setCellValue("数据日期");
                    }else{
                        cell.setCellValue(rowList.get(j));
                    }

                    cell.setCellValue(rowList.get(j));
//                    if(i==0&&j==0){
//                        cell.setCellValue("数据日期");
//                    }else{
//                        cell.setCellValue(rowList.get(j));
//                    }
                    if(i==0){
                        sheet.setColumnWidth(i, rowList.get(i).length() * 2 * 256);
                        sheet.setColumnWidth(i, (rowList.get(j).length() + 2 )  * 2 * 256);
//                        cell.setCellStyle(hstyle);
                    }
                    if(i==0 || j==0){
                        cell.setCellStyle(hstyle);
                    }else if(j==0){
                    }else{
                        cell.setCellStyle(rowStyle);
                    }
                }
@@ -502,8 +505,8 @@
        configDataCellStyle.setAlignment(HorizontalAlignment.CENTER);
        configDataCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
        // 设置背景
        configDataCellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
        configDataCellStyle.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
//        configDataCellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
//        configDataCellStyle.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
        // 字体
        Font font = workbook.createFont();
        font.setFontHeightInPoints((short) 10);
@@ -512,7 +515,6 @@
        // 边框
        configCellBorder(configDataCellStyle);
        configDataCellStyle.setWrapText(true);

        return configDataCellStyle;
    }