diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiPurchaseTransactionController.java b/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiPurchaseTransactionController.java index 2c44d57..bbdcad4 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiPurchaseTransactionController.java +++ b/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiPurchaseTransactionController.java @@ -6,6 +6,7 @@ import com.ruoyi.ccdi.domain.dto.CcdiPurchaseTransactionEditDTO; import com.ruoyi.ccdi.domain.dto.CcdiPurchaseTransactionQueryDTO; import com.ruoyi.ccdi.domain.excel.CcdiPurchaseTransactionExcel; import com.ruoyi.ccdi.domain.vo.CcdiPurchaseTransactionVO; +import com.ruoyi.ccdi.domain.vo.ImportResultVO; import com.ruoyi.ccdi.domain.vo.PurchaseTransactionImportFailureVO; import com.ruoyi.ccdi.domain.vo.ImportStatusVO; import com.ruoyi.ccdi.service.ICcdiPurchaseTransactionImportService; @@ -140,8 +141,21 @@ public class CcdiPurchaseTransactionController extends BaseController { public AjaxResult importData(@Parameter(description = "导入文件") MultipartFile file, @Parameter(description = "是否更新支持") boolean updateSupport) throws Exception { List list = EasyExcelUtil.importExcel(file.getInputStream(), CcdiPurchaseTransactionExcel.class); + + if (list == null || list.isEmpty()) { + return error("至少需要一条数据"); + } + + // 提交异步任务 String taskId = transactionService.importTransaction(list, updateSupport); - return success("导入任务已提交,任务ID:" + taskId); + + // 立即返回,不等待后台任务完成 + ImportResultVO result = new ImportResultVO(); + result.setTaskId(taskId); + result.setStatus("PROCESSING"); + result.setMessage("导入任务已提交,正在后台处理"); + + return AjaxResult.success("导入任务已提交,正在后台处理", result); } /**