From dd99da83d2708dc1fdb84f9fa71b5e63d5579338 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 10 十一月 2022 17:37:08 +0800
Subject: [PATCH] Merge branch 'local_20221104' into haucheng_panzhihua
---
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 b2b370d..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,8 +303,15 @@
{
boolean a = false;
String fileName = file.getOriginalFilename();
- return null;
-
+ 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("部分失败");//导入失败
}
--
Gitblit v1.7.1