From 6eeadd7ec3d4079522a1f56e819d042c5b4bacbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Fri, 9 Jan 2026 10:13:56 +0800 Subject: [PATCH] =?UTF-8?q?feat(credit):=20=E6=94=AF=E6=8C=81=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E5=B7=A5=E4=BD=9C=E8=A1=A8=E7=B4=A2=E5=BC=95=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E4=BF=A1=E7=94=A8=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加 ExcelImportSupport.findSheetIndex 方法查找特定工作表 - 修改 tryImport 方法支持传入工作表索引参数 - 更新导入配置循环使用指定工作表索引 - 修改 readNameHyperlinks 方法使用正确的工作表索引读取超链接 - 设置 ImportParams 的起始工作表索引为动态获取的索引值 --- .../credit/controller/CreditUserController.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditUserController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditUserController.java index 9730b20..921d159 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditUserController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditUserController.java @@ -154,13 +154,14 @@ public class CreditUserController extends BaseController { int successCount = 0; try { + int sheetIndex = ExcelImportSupport.findSheetIndex(file, "招投标", 0); List list = null; int usedTitleRows = 0; int usedHeadRows = 0; int[][] tryConfigs = new int[][]{{1, 1}, {0, 1}, {0, 2}, {0, 3}}; for (int[] config : tryConfigs) { - list = filterEmptyRows(tryImport(file, config[0], config[1])); + list = filterEmptyRows(tryImport(file, config[0], config[1], sheetIndex)); if (!CollectionUtils.isEmpty(list)) { usedTitleRows = config[0]; usedHeadRows = config[1]; @@ -174,7 +175,7 @@ public class CreditUserController extends BaseController { User loginUser = getLoginUser(); Integer currentUserId = loginUser != null ? loginUser.getUserId() : null; Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null; - Map urlMap = readNameHyperlinks(file, 0, usedTitleRows, usedHeadRows); + Map urlMap = readNameHyperlinks(file, sheetIndex, usedTitleRows, usedHeadRows); for (int i = 0; i < list.size(); i++) { CreditUserImportParam param = list.get(i); @@ -275,11 +276,11 @@ public class CreditUserController extends BaseController { workbook.close(); } - private List tryImport(MultipartFile file, int titleRows, int headRows) throws Exception { + private List tryImport(MultipartFile file, int titleRows, int headRows, int sheetIndex) throws Exception { ImportParams importParams = new ImportParams(); importParams.setTitleRows(titleRows); importParams.setHeadRows(headRows); - importParams.setStartSheetIndex(0); + importParams.setStartSheetIndex(sheetIndex); importParams.setSheetNum(1); return ExcelImportUtil.importExcel(file.getInputStream(), CreditUserImportParam.class, importParams); }