From b892b3d8c2a536b6c2f5f9b9e67e195779037665 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 15 十一月 2022 14:17:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
index 2a7c7c6..4373024 100644
--- a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
@@ -303,11 +303,15 @@
{
boolean a = false;
String fileName = file.getOriginalFilename();
- boolean b = iTransactionEventService.batchImport(fileName, file);
- if (b){
- return ResultData.success("导入成功");
+ Integer b = iTransactionEventService.batchImport(fileName, file);
+ if (b == 3) {//
+ return ResultData.success("全部导入成功");//全部导入成功
+ } else if (b == 2) {
+ return ResultData.success("部分导入成功");//部分导入成功
+ } else if (b == 0) {
+ return ResultData.error("部分失败");//导入失败
}
- return ResultData.error("导入失败");
+ return ResultData.error("部分失败");//导入失败
}
--
Gitblit v1.7.1