From aed3ce7ad2c84f5e074371e2ba081d9903ec42e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Wed, 22 Apr 2026 16:06:08 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=AD=A3=E6=96=87=E4=BB=B6=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E8=AF=BB=E5=8F=96=E5=92=8C=E6=96=87=E4=BB=B6=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E4=B8=8D=E5=87=86=E7=A1=AE=E5=AF=BC=E8=87=B4=E9=A2=84?= =?UTF-8?q?=E5=88=87=E6=9D=BF=E6=95=B0=E6=8D=AE=E8=AE=A1=E7=AE=97=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gj_erp/service/jcsj/impl/DmBclqmxpServiceImpl.java | 2 +- src/main/java/com/dsic/gj_erp/util/ExcelUtil.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) 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); } }