联讯物业系统后台
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
wuxw
2025-03-28 560b781b841c18b8cb179a0603620d85536f2d9a 
 java110-utils/src/main/java/com/java110/utils/util/ImportExcelUtils.java


@@ -82,6 +82,10 @@


     */


    public static final List<Object[]> listFromSheet(Sheet sheet) {




        if(sheet == null){


            throw new IllegalArgumentException("excel sheet 未找到，请不要篡改excel模板");


        }




        List<Object[]> list = new ArrayList<Object[]>();


        for (int r = sheet.getFirstRowNum(); r <= sheet.getLastRowNum(); r++) {


            Row row = sheet.getRow(r);


@@ -124,8 +128,7 @@


                        result = df.format(((HSSFCell) cell).getNumericCellValue());


                        break;


                    case HSSFCell.CELL_TYPE_FORMULA:


                        result = ((HSSFCell) cell).getNumericCellValue();


                        break;


                        throw new IllegalArgumentException("请不要公式计算，程序没法计算Excel的公式");


                    case HSSFCell.CELL_TYPE_BOOLEAN:


                        result = ((HSSFCell) cell).getBooleanCellValue();


                        break;


@@ -153,8 +156,8 @@


                        result = df.format(((XSSFCell) cell).getNumericCellValue());


                        break;


                    case XSSFCell.CELL_TYPE_FORMULA:


                        result = ((XSSFCell) cell).getNumericCellValue();


                        break;


                        //result = ((XSSFCell) cell).getNumericCellValue();


                        throw new IllegalArgumentException("请不要公式计算，程序没法计算Excel的公式");


                    case XSSFCell.CELL_TYPE_BOOLEAN:


                        result = ((XSSFCell) cell).getBooleanCellValue();


                        break;