diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBclqmxpServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBclqmxpServiceImpl.java index 62389c5..2e6c0e2 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBclqmxpServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBclqmxpServiceImpl.java @@ -56,7 +56,7 @@ public class DmBclqmxpServiceImpl extends ServiceImpl{ String dirStr="static/upload/"+dcCh+"/"+pl+"/其他"; File fileDir = new File(dirStr); - String patternStr = pl + "批量钢材领取表"; + String patternStr = "批量钢材领取表"; List fileList = FileUtil.loopFiles(fileDir); fileList.stream() .filter(file -> file.getName().contains(patternStr)) diff --git a/src/main/java/com/dsic/gj_erp/util/ExcelUtil.java b/src/main/java/com/dsic/gj_erp/util/ExcelUtil.java index 83805ba..c5b6213 100644 --- a/src/main/java/com/dsic/gj_erp/util/ExcelUtil.java +++ b/src/main/java/com/dsic/gj_erp/util/ExcelUtil.java @@ -25,13 +25,13 @@ public class ExcelUtil { public static List ReadExcelByLine(File file){ try (FileInputStream fis = new FileInputStream(file); - Workbook workbook = new XSSFWorkbook(fis)) { // 对于xls文件,使用HSSFWorkbook + Workbook workbook = WorkbookFactory.create(fis)) { return handler(workbook); - } catch (IOException e) { + } catch (Exception e) { try (FileInputStream fis = new FileInputStream(file); Workbook workbook = new HSSFWorkbook(fis)){ return handler(workbook); - }catch (IOException e1){ + }catch (Exception e1){ log.info("{}损坏",file.getName()); } } @@ -41,10 +41,10 @@ public class ExcelUtil { public static List ReadExcelByLine(InputStream fis, String fileName){ try (Workbook workbook = new XSSFWorkbook(fis)) { // 对于xls文件,使用HSSFWorkbook return handler(workbook); - } catch (IOException e) { + } catch (Exception e) { try (Workbook workbook = new HSSFWorkbook(fis)){ return handler(workbook); - }catch (IOException e1){ + }catch (Exception e1){ log.info("{}损坏",fileName); } }