|  | @@ -36,6 +36,7 @@ import org.apache.poi.ss.usermodel.Sheet;
 | 
											
												
													
														|  |  import org.apache.poi.ss.usermodel.VerticalAlignment;
 |  |  import org.apache.poi.ss.usermodel.VerticalAlignment;
 | 
											
												
													
														|  |  import org.apache.poi.ss.usermodel.Workbook;
 |  |  import org.apache.poi.ss.usermodel.Workbook;
 | 
											
												
													
														|  |  import org.apache.poi.ss.usermodel.WorkbookFactory;
 |  |  import org.apache.poi.ss.usermodel.WorkbookFactory;
 | 
											
												
													
														|  | 
 |  | +import org.apache.poi.ss.util.CellRangeAddress;
 | 
											
												
													
														|  |  import org.apache.poi.ss.util.CellRangeAddressList;
 |  |  import org.apache.poi.ss.util.CellRangeAddressList;
 | 
											
												
													
														|  |  import org.apache.poi.util.IOUtils;
 |  |  import org.apache.poi.util.IOUtils;
 | 
											
												
													
														|  |  import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 |  |  import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 | 
											
										
											
												
													
														|  | @@ -103,6 +104,16 @@ public class ExcelUtil<T>
 | 
											
												
													
														|  |       */
 |  |       */
 | 
											
												
													
														|  |      private List<Object[]> fields;
 |  |      private List<Object[]> fields;
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | 
 |  | +    /**
 | 
											
												
													
														|  | 
 |  | +     * 当前行号
 | 
											
												
													
														|  | 
 |  | +     */
 | 
											
												
													
														|  | 
 |  | +    private int rownum;
 | 
											
												
													
														|  | 
 |  | +    
 | 
											
												
													
														|  | 
 |  | +    /**
 | 
											
												
													
														|  | 
 |  | +     * 标题
 | 
											
												
													
														|  | 
 |  | +     */
 | 
											
												
													
														|  | 
 |  | +    private String title;
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  |      /**
 |  |      /**
 | 
											
												
													
														|  |       * 最大高度
 |  |       * 最大高度
 | 
											
												
													
														|  |       */
 |  |       */
 | 
											
										
											
												
													
														|  | @@ -128,7 +139,7 @@ public class ExcelUtil<T>
 | 
											
												
													
														|  |          this.clazz = clazz;
 |  |          this.clazz = clazz;
 | 
											
												
													
														|  |      }
 |  |      }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | -    public void init(List<T> list, String sheetName, Type type)
 |  | 
 | 
											
												
													
														|  | 
 |  | +    public void init(List<T> list, String sheetName, String title, Type type)
 | 
											
												
													
														|  |      {
 |  |      {
 | 
											
												
													
														|  |          if (list == null)
 |  |          if (list == null)
 | 
											
												
													
														|  |          {
 |  |          {
 | 
											
										
											
												
													
														|  | @@ -137,8 +148,27 @@ public class ExcelUtil<T>
 | 
											
												
													
														|  |          this.list = list;
 |  |          this.list = list;
 | 
											
												
													
														|  |          this.sheetName = sheetName;
 |  |          this.sheetName = sheetName;
 | 
											
												
													
														|  |          this.type = type;
 |  |          this.type = type;
 | 
											
												
													
														|  | 
 |  | +        this.title = title;
 | 
											
												
													
														|  |          createExcelField();
 |  |          createExcelField();
 | 
											
												
													
														|  |          createWorkbook();
 |  |          createWorkbook();
 | 
											
												
													
														|  | 
 |  | +        createTitle();
 | 
											
												
													
														|  | 
 |  | +    }
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  | 
 |  | +    /**
 | 
											
												
													
														|  | 
 |  | +     * 创建excel第一行标题
 | 
											
												
													
														|  | 
 |  | +     */
 | 
											
												
													
														|  | 
 |  | +    public void createTitle()
 | 
											
												
													
														|  | 
 |  | +    {
 | 
											
												
													
														|  | 
 |  | +        if (StringUtils.isNotEmpty(title))
 | 
											
												
													
														|  | 
 |  | +        {
 | 
											
												
													
														|  | 
 |  | +            Row titleRow = sheet.createRow(rownum == 0 ? rownum++ : 0);
 | 
											
												
													
														|  | 
 |  | +            titleRow.setHeightInPoints(30);
 | 
											
												
													
														|  | 
 |  | +            Cell titleCell = titleRow.createCell(0);
 | 
											
												
													
														|  | 
 |  | +            titleCell.setCellStyle(styles.get("title"));
 | 
											
												
													
														|  | 
 |  | +            titleCell.setCellValue(title);
 | 
											
												
													
														|  | 
 |  | +            sheet.addMergedRegion(new CellRangeAddress(titleRow.getRowNum(), titleRow.getRowNum(), titleRow.getRowNum(),
 | 
											
												
													
														|  | 
 |  | +                    this.fields.size() - 1));
 | 
											
												
													
														|  | 
 |  | +        }
 | 
											
												
													
														|  |      }
 |  |      }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |      /**
 |  |      /**
 | 
											
										
											
												
													
														|  | @@ -149,33 +179,36 @@ public class ExcelUtil<T>
 | 
											
												
													
														|  |       */
 |  |       */
 | 
											
												
													
														|  |      public List<T> importExcel(InputStream is) throws Exception
 |  |      public List<T> importExcel(InputStream is) throws Exception
 | 
											
												
													
														|  |      {
 |  |      {
 | 
											
												
													
														|  | -        return importExcel(StringUtils.EMPTY, is);
 |  | 
 | 
											
												
													
														|  | 
 |  | +        return importExcel(is, 0);
 | 
											
												
													
														|  | 
 |  | +    }
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  | 
 |  | +    /**
 | 
											
												
													
														|  | 
 |  | +     * 对excel表单默认第一个索引名转换成list
 | 
											
												
													
														|  | 
 |  | +     * 
 | 
											
												
													
														|  | 
 |  | +     * @param is 输入流
 | 
											
												
													
														|  | 
 |  | +     * @param titleNum 标题占用行数
 | 
											
												
													
														|  | 
 |  | +     * @return 转换后集合
 | 
											
												
													
														|  | 
 |  | +     */
 | 
											
												
													
														|  | 
 |  | +    public List<T> importExcel(InputStream is, int titleNum) throws Exception
 | 
											
												
													
														|  | 
 |  | +    {
 | 
											
												
													
														|  | 
 |  | +        return importExcel(StringUtils.EMPTY, is, titleNum);
 | 
											
												
													
														|  |      }
 |  |      }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |      /**
 |  |      /**
 | 
											
												
													
														|  |       * 对excel表单指定表格索引名转换成list
 |  |       * 对excel表单指定表格索引名转换成list
 | 
											
												
													
														|  |       * 
 |  |       * 
 | 
											
												
													
														|  |       * @param sheetName 表格索引名
 |  |       * @param sheetName 表格索引名
 | 
											
												
													
														|  | 
 |  | +     * @param titleNum 标题占用行数
 | 
											
												
													
														|  |       * @param is 输入流
 |  |       * @param is 输入流
 | 
											
												
													
														|  |       * @return 转换后集合
 |  |       * @return 转换后集合
 | 
											
												
													
														|  |       */
 |  |       */
 | 
											
												
													
														|  | -    public List<T> importExcel(String sheetName, InputStream is) throws Exception
 |  | 
 | 
											
												
													
														|  | 
 |  | +    public List<T> importExcel(String sheetName, InputStream is, int titleNum) throws Exception
 | 
											
												
													
														|  |      {
 |  |      {
 | 
											
												
													
														|  |          this.type = Type.IMPORT;
 |  |          this.type = Type.IMPORT;
 | 
											
												
													
														|  |          this.wb = WorkbookFactory.create(is);
 |  |          this.wb = WorkbookFactory.create(is);
 | 
											
												
													
														|  |          List<T> list = new ArrayList<T>();
 |  |          List<T> list = new ArrayList<T>();
 | 
											
												
													
														|  | -        Sheet sheet = null;
 |  | 
 | 
											
												
													
														|  | -        if (StringUtils.isNotEmpty(sheetName))
 |  | 
 | 
											
												
													
														|  | -        {
 |  | 
 | 
											
												
													
														|  | -            // 如果指定sheet名,则取指定sheet中的内容.
 |  | 
 | 
											
												
													
														|  | -            sheet = wb.getSheet(sheetName);
 |  | 
 | 
											
												
													
														|  | -        }
 |  | 
 | 
											
												
													
														|  | -        else
 |  | 
 | 
											
												
													
														|  | -        {
 |  | 
 | 
											
												
													
														|  | -            // 如果传入的sheet名不存在则默认指向第1个sheet.
 |  | 
 | 
											
												
													
														|  | -            sheet = wb.getSheetAt(0);
 |  | 
 | 
											
												
													
														|  | -        }
 |  | 
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  | 
 |  | +        // 如果指定sheet名,则取指定sheet中的内容 否则默认指向第1个sheet
 | 
											
												
													
														|  | 
 |  | +        Sheet sheet = StringUtils.isNotEmpty(sheetName) ? wb.getSheet(sheetName) : wb.getSheetAt(0);
 | 
											
												
													
														|  |          if (sheet == null)
 |  |          if (sheet == null)
 | 
											
												
													
														|  |          {
 |  |          {
 | 
											
												
													
														|  |              throw new IOException("文件sheet不存在");
 |  |              throw new IOException("文件sheet不存在");
 | 
											
										
											
												
													
														|  | @@ -189,7 +222,7 @@ public class ExcelUtil<T>
 | 
											
												
													
														|  |              // 定义一个map用于存放excel列的序号和field.
 |  |              // 定义一个map用于存放excel列的序号和field.
 | 
											
												
													
														|  |              Map<String, Integer> cellMap = new HashMap<String, Integer>();
 |  |              Map<String, Integer> cellMap = new HashMap<String, Integer>();
 | 
											
												
													
														|  |              // 获取表头
 |  |              // 获取表头
 | 
											
												
													
														|  | -            Row heard = sheet.getRow(0);
 |  | 
 | 
											
												
													
														|  | 
 |  | +            Row heard = sheet.getRow(titleNum);
 | 
											
												
													
														|  |              for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++)
 |  |              for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++)
 | 
											
												
													
														|  |              {
 |  |              {
 | 
											
												
													
														|  |                  Cell cell = heard.getCell(i);
 |  |                  Cell cell = heard.getCell(i);
 | 
											
										
											
												
													
														|  | @@ -222,7 +255,7 @@ public class ExcelUtil<T>
 | 
											
												
													
														|  |                      }
 |  |                      }
 | 
											
												
													
														|  |                  }
 |  |                  }
 | 
											
												
													
														|  |              }
 |  |              }
 | 
											
												
													
														|  | -            for (int i = 1; i <= rows; i++)
 |  | 
 | 
											
												
													
														|  | 
 |  | +            for (int i = titleNum + 1; i <= rows; i++)
 | 
											
												
													
														|  |              {
 |  |              {
 | 
											
												
													
														|  |                  // 从第2行开始取数据,默认第一行是表头.
 |  |                  // 从第2行开始取数据,默认第一行是表头.
 | 
											
												
													
														|  |                  Row row = sheet.getRow(i);
 |  |                  Row row = sheet.getRow(i);
 | 
											
										
											
												
													
														|  | @@ -331,14 +364,35 @@ public class ExcelUtil<T>
 | 
											
												
													
														|  |       * @return 结果
 |  |       * @return 结果
 | 
											
												
													
														|  |       * @throws IOException
 |  |       * @throws IOException
 | 
											
												
													
														|  |       */
 |  |       */
 | 
											
												
													
														|  | -    public void exportExcel(HttpServletResponse response, List<T> list, String sheetName) throws IOException
 |  | 
 | 
											
												
													
														|  | 
 |  | +    public void exportExcel(HttpServletResponse response, List<T> list, String sheetName)throws IOException
 | 
											
												
													
														|  | 
 |  | +    {
 | 
											
												
													
														|  | 
 |  | +        exportExcel(response, list, sheetName, StringUtils.EMPTY);
 | 
											
												
													
														|  | 
 |  | +    }
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  | 
 |  | +    /**
 | 
											
												
													
														|  | 
 |  | +     * 对list数据源将其里面的数据导入到excel表单
 | 
											
												
													
														|  | 
 |  | +     * 
 | 
											
												
													
														|  | 
 |  | +     * @param response 返回数据
 | 
											
												
													
														|  | 
 |  | +     * @param list 导出数据集合
 | 
											
												
													
														|  | 
 |  | +     * @param sheetName 工作表的名称
 | 
											
												
													
														|  | 
 |  | +     * @param title 标题
 | 
											
												
													
														|  | 
 |  | +     * @return 结果
 | 
											
												
													
														|  | 
 |  | +     * @throws IOException
 | 
											
												
													
														|  | 
 |  | +     */
 | 
											
												
													
														|  | 
 |  | +    public void exportExcel(HttpServletResponse response, List<T> list, String sheetName, String title) throws IOException
 | 
											
												
													
														|  |      {
 |  |      {
 | 
											
												
													
														|  |          response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
 |  |          response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
 | 
											
												
													
														|  |          response.setCharacterEncoding("utf-8");
 |  |          response.setCharacterEncoding("utf-8");
 | 
											
												
													
														|  | -        this.init(list, sheetName, Type.EXPORT);
 |  | 
 | 
											
												
													
														|  | 
 |  | +        this.init(list, sheetName, title, Type.EXPORT);
 | 
											
												
													
														|  |          exportExcel(response.getOutputStream());
 |  |          exportExcel(response.getOutputStream());
 | 
											
												
													
														|  |      }
 |  |      }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | 
 |  | +    /**
 | 
											
												
													
														|  | 
 |  | +     * 对list数据源将其里面的数据导入到excel表单
 | 
											
												
													
														|  | 
 |  | +     * 
 | 
											
												
													
														|  | 
 |  | +     * @param sheetName 工作表的名称
 | 
											
												
													
														|  | 
 |  | +     * @return 结果
 | 
											
												
													
														|  | 
 |  | +     */
 | 
											
												
													
														|  |      /**
 |  |      /**
 | 
											
												
													
														|  |       * 对list数据源将其里面的数据导入到excel表单
 |  |       * 对list数据源将其里面的数据导入到excel表单
 | 
											
												
													
														|  |       * 
 |  |       * 
 | 
											
										
											
												
													
														|  | @@ -346,10 +400,22 @@ public class ExcelUtil<T>
 | 
											
												
													
														|  |       * @return 结果
 |  |       * @return 结果
 | 
											
												
													
														|  |       */
 |  |       */
 | 
											
												
													
														|  |      public void importTemplateExcel(HttpServletResponse response, String sheetName) throws IOException
 |  |      public void importTemplateExcel(HttpServletResponse response, String sheetName) throws IOException
 | 
											
												
													
														|  | 
 |  | +    {
 | 
											
												
													
														|  | 
 |  | +        importTemplateExcel(response, sheetName);
 | 
											
												
													
														|  | 
 |  | +    }
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  | 
 |  | +    /**
 | 
											
												
													
														|  | 
 |  | +     * 对list数据源将其里面的数据导入到excel表单
 | 
											
												
													
														|  | 
 |  | +     * 
 | 
											
												
													
														|  | 
 |  | +     * @param sheetName 工作表的名称
 | 
											
												
													
														|  | 
 |  | +     * @param title 标题
 | 
											
												
													
														|  | 
 |  | +     * @return 结果
 | 
											
												
													
														|  | 
 |  | +     */
 | 
											
												
													
														|  | 
 |  | +    public void importTemplateExcel(HttpServletResponse response, String sheetName, String title) throws IOException
 | 
											
												
													
														|  |      {
 |  |      {
 | 
											
												
													
														|  |          response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
 |  |          response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
 | 
											
												
													
														|  |          response.setCharacterEncoding("utf-8");
 |  |          response.setCharacterEncoding("utf-8");
 | 
											
												
													
														|  | -        this.init(null, sheetName, Type.IMPORT);
 |  | 
 | 
											
												
													
														|  | 
 |  | +        this.init(null, sheetName, title, Type.IMPORT);
 | 
											
												
													
														|  |          exportExcel(response.getOutputStream());
 |  |          exportExcel(response.getOutputStream());
 | 
											
												
													
														|  |      }
 |  |      }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
										
											
												
													
														|  | @@ -382,13 +448,13 @@ public class ExcelUtil<T>
 | 
											
												
													
														|  |      public void writeSheet()
 |  |      public void writeSheet()
 | 
											
												
													
														|  |      {
 |  |      {
 | 
											
												
													
														|  |          // 取出一共有多少个sheet.
 |  |          // 取出一共有多少个sheet.
 | 
											
												
													
														|  | -        double sheetNo = Math.ceil(list.size() / sheetSize);
 |  | 
 | 
											
												
													
														|  | -        for (int index = 0; index <= sheetNo; index++)
 |  | 
 | 
											
												
													
														|  | 
 |  | +        int sheetNo = Math.max(1, (int) Math.ceil(list.size() * 1.0 / sheetSize));
 | 
											
												
													
														|  | 
 |  | +        for (int index = 0; index < sheetNo; index++)
 | 
											
												
													
														|  |          {
 |  |          {
 | 
											
												
													
														|  |              createSheet(sheetNo, index);
 |  |              createSheet(sheetNo, index);
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |              // 产生一行
 |  |              // 产生一行
 | 
											
												
													
														|  | -            Row row = sheet.createRow(0);
 |  | 
 | 
											
												
													
														|  | 
 |  | +            Row row = sheet.createRow(rownum);
 | 
											
												
													
														|  |              int column = 0;
 |  |              int column = 0;
 | 
											
												
													
														|  |              // 写入各个字段的列头名称
 |  |              // 写入各个字段的列头名称
 | 
											
												
													
														|  |              for (Object[] os : fields)
 |  |              for (Object[] os : fields)
 | 
											
										
											
												
													
														|  | @@ -416,7 +482,7 @@ public class ExcelUtil<T>
 | 
											
												
													
														|  |          int endNo = Math.min(startNo + sheetSize, list.size());
 |  |          int endNo = Math.min(startNo + sheetSize, list.size());
 | 
											
												
													
														|  |          for (int i = startNo; i < endNo; i++)
 |  |          for (int i = startNo; i < endNo; i++)
 | 
											
												
													
														|  |          {
 |  |          {
 | 
											
												
													
														|  | -            row = sheet.createRow(i + 1 - startNo);
 |  | 
 | 
											
												
													
														|  | 
 |  | +            row = sheet.createRow(i + 1 + rownum - startNo);
 | 
											
												
													
														|  |              // 得到导出对象.
 |  |              // 得到导出对象.
 | 
											
												
													
														|  |              T vo = (T) list.get(i);
 |  |              T vo = (T) list.get(i);
 | 
											
												
													
														|  |              int column = 0;
 |  |              int column = 0;
 | 
											
										
											
												
													
														|  | @@ -444,6 +510,16 @@ public class ExcelUtil<T>
 | 
											
												
													
														|  |          CellStyle style = wb.createCellStyle();
 |  |          CellStyle style = wb.createCellStyle();
 | 
											
												
													
														|  |          style.setAlignment(HorizontalAlignment.CENTER);
 |  |          style.setAlignment(HorizontalAlignment.CENTER);
 | 
											
												
													
														|  |          style.setVerticalAlignment(VerticalAlignment.CENTER);
 |  |          style.setVerticalAlignment(VerticalAlignment.CENTER);
 | 
											
												
													
														|  | 
 |  | +        Font titleFont = wb.createFont();
 | 
											
												
													
														|  | 
 |  | +        titleFont.setFontName("Arial");
 | 
											
												
													
														|  | 
 |  | +        titleFont.setFontHeightInPoints((short) 16);
 | 
											
												
													
														|  | 
 |  | +        titleFont.setBold(true);
 | 
											
												
													
														|  | 
 |  | +        style.setFont(titleFont);
 | 
											
												
													
														|  | 
 |  | +        styles.put("title", style);
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  | 
 |  | +        style = wb.createCellStyle();
 | 
											
												
													
														|  | 
 |  | +        style.setAlignment(HorizontalAlignment.CENTER);
 | 
											
												
													
														|  | 
 |  | +        style.setVerticalAlignment(VerticalAlignment.CENTER);
 | 
											
												
													
														|  |          style.setBorderRight(BorderStyle.THIN);
 |  |          style.setBorderRight(BorderStyle.THIN);
 | 
											
												
													
														|  |          style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
 |  |          style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
 | 
											
												
													
														|  |          style.setBorderLeft(BorderStyle.THIN);
 |  |          style.setBorderLeft(BorderStyle.THIN);
 | 
											
										
											
												
													
														|  | @@ -471,7 +547,7 @@ public class ExcelUtil<T>
 | 
											
												
													
														|  |          headerFont.setColor(IndexedColors.WHITE.getIndex());
 |  |          headerFont.setColor(IndexedColors.WHITE.getIndex());
 | 
											
												
													
														|  |          style.setFont(headerFont);
 |  |          style.setFont(headerFont);
 | 
											
												
													
														|  |          styles.put("header", style);
 |  |          styles.put("header", style);
 | 
											
												
													
														|  | -        
 |  | 
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  |          style = wb.createCellStyle();
 |  |          style = wb.createCellStyle();
 | 
											
												
													
														|  |          style.setAlignment(HorizontalAlignment.CENTER);
 |  |          style.setAlignment(HorizontalAlignment.CENTER);
 | 
											
												
													
														|  |          style.setVerticalAlignment(VerticalAlignment.CENTER);
 |  |          style.setVerticalAlignment(VerticalAlignment.CENTER);
 | 
											
										
											
												
													
														|  | @@ -840,10 +916,9 @@ public class ExcelUtil<T>
 | 
											
												
													
														|  |      {
 |  |      {
 | 
											
												
													
														|  |          if (statistics.size() > 0)
 |  |          if (statistics.size() > 0)
 | 
											
												
													
														|  |          {
 |  |          {
 | 
											
												
													
														|  | -            Cell cell = null;
 |  | 
 | 
											
												
													
														|  |              Row row = sheet.createRow(sheet.getLastRowNum() + 1);
 |  |              Row row = sheet.createRow(sheet.getLastRowNum() + 1);
 | 
											
												
													
														|  |              Set<Integer> keys = statistics.keySet();
 |  |              Set<Integer> keys = statistics.keySet();
 | 
											
												
													
														|  | -            cell = row.createCell(0);
 |  | 
 | 
											
												
													
														|  | 
 |  | +            Cell cell = row.createCell(0);
 | 
											
												
													
														|  |              cell.setCellStyle(styles.get("total"));
 |  |              cell.setCellStyle(styles.get("total"));
 | 
											
												
													
														|  |              cell.setCellValue("合计");
 |  |              cell.setCellValue("合计");
 | 
											
												
													
														|  |  
 |  |  
 | 
											
										
											
												
													
														|  | @@ -939,7 +1014,7 @@ public class ExcelUtil<T>
 | 
											
												
													
														|  |          this.fields = this.fields.stream().sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort())).collect(Collectors.toList());
 |  |          this.fields = this.fields.stream().sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort())).collect(Collectors.toList());
 | 
											
												
													
														|  |          this.maxHeight = getRowHeight();
 |  |          this.maxHeight = getRowHeight();
 | 
											
												
													
														|  |      }
 |  |      }
 | 
											
												
													
														|  | -    
 |  | 
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  |      /**
 |  |      /**
 | 
											
												
													
														|  |       * 根据注解获取最大行高
 |  |       * 根据注解获取最大行高
 | 
											
												
													
														|  |       */
 |  |       */
 | 
											
										
											
												
													
														|  | @@ -971,6 +1046,9 @@ public class ExcelUtil<T>
 | 
											
												
													
														|  |      public void createWorkbook()
 |  |      public void createWorkbook()
 | 
											
												
													
														|  |      {
 |  |      {
 | 
											
												
													
														|  |          this.wb = new SXSSFWorkbook(500);
 |  |          this.wb = new SXSSFWorkbook(500);
 | 
											
												
													
														|  | 
 |  | +        this.sheet = wb.createSheet();
 | 
											
												
													
														|  | 
 |  | +        wb.setSheetName(0, sheetName);
 | 
											
												
													
														|  | 
 |  | +        this.styles = createStyles(wb);
 | 
											
												
													
														|  |      }
 |  |      }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |      /**
 |  |      /**
 | 
											
										
											
												
													
														|  | @@ -979,17 +1057,13 @@ public class ExcelUtil<T>
 | 
											
												
													
														|  |       * @param sheetNo sheet数量
 |  |       * @param sheetNo sheet数量
 | 
											
												
													
														|  |       * @param index 序号
 |  |       * @param index 序号
 | 
											
												
													
														|  |       */
 |  |       */
 | 
											
												
													
														|  | -    public void createSheet(double sheetNo, int index)
 |  | 
 | 
											
												
													
														|  | 
 |  | +    public void createSheet(int sheetNo, int index)
 | 
											
												
													
														|  |      {
 |  |      {
 | 
											
												
													
														|  | -        this.sheet = wb.createSheet();
 |  | 
 | 
											
												
													
														|  | -        this.styles = createStyles(wb);
 |  | 
 | 
											
												
													
														|  |          // 设置工作表的名称.
 |  |          // 设置工作表的名称.
 | 
											
												
													
														|  | -        if (sheetNo == 0)
 |  | 
 | 
											
												
													
														|  | -        {
 |  | 
 | 
											
												
													
														|  | -            wb.setSheetName(index, sheetName);
 |  | 
 | 
											
												
													
														|  | -        }
 |  | 
 | 
											
												
													
														|  | -        else
 |  | 
 | 
											
												
													
														|  | 
 |  | +        if (sheetNo > 1 && index > 0)
 | 
											
												
													
														|  |          {
 |  |          {
 | 
											
												
													
														|  | 
 |  | +            this.sheet = wb.createSheet();
 | 
											
												
													
														|  | 
 |  | +            this.createTitle();
 | 
											
												
													
														|  |              wb.setSheetName(index, sheetName + index);
 |  |              wb.setSheetName(index, sheetName + index);
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
												
													
														|  |      }
 |  |      }
 |