feat(credit): 优化破产重整数据导入功能
- 优先从名为"破产重整"的标签页导入数据,避免多工作表文件中的意外导入 - 当指定标签页不存在时,向后兼容使用任意工作表导入方式 - 添加详细的注释说明导入逻辑和向后兼容性处理
This commit is contained in:
@@ -195,8 +195,16 @@ public class CreditBankruptcyController extends BaseController {
|
|||||||
Set<Integer> touchedCompanyIds = new HashSet<>();
|
Set<Integer> touchedCompanyIds = new HashSet<>();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
ExcelImportSupport.ImportResult<CreditBankruptcyImportParam> importResult = ExcelImportSupport.readAnySheet(
|
// Prefer importing from the explicit tab name "破产重整" when present.
|
||||||
file, CreditBankruptcyImportParam.class, this::isEmptyImportRow);
|
// This avoids accidentally importing from other sheets (e.g. "历史破产重整") in multi-sheet workbooks.
|
||||||
|
int sheetIndex = ExcelImportSupport.findSheetIndex(file, "破产重整");
|
||||||
|
ExcelImportSupport.ImportResult<CreditBankruptcyImportParam> importResult;
|
||||||
|
if (sheetIndex >= 0) {
|
||||||
|
importResult = ExcelImportSupport.read(file, CreditBankruptcyImportParam.class, this::isEmptyImportRow, sheetIndex);
|
||||||
|
} else {
|
||||||
|
// Backward compatible: try any sheet for older templates without the expected tab name.
|
||||||
|
importResult = ExcelImportSupport.readAnySheet(file, CreditBankruptcyImportParam.class, this::isEmptyImportRow);
|
||||||
|
}
|
||||||
List<CreditBankruptcyImportParam> list = importResult.getData();
|
List<CreditBankruptcyImportParam> list = importResult.getData();
|
||||||
int usedTitleRows = importResult.getTitleRows();
|
int usedTitleRows = importResult.getTitleRows();
|
||||||
int usedHeadRows = importResult.getHeadRows();
|
int usedHeadRows = importResult.getHeadRows();
|
||||||
|
|||||||
BIN
websoft-modules.log.2026-03-02.0.gz
Normal file
BIN
websoft-modules.log.2026-03-02.0.gz
Normal file
Binary file not shown.
Reference in New Issue
Block a user