From fe3d8816882117d963c93b678573bb93f0047911 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 08 十一月 2022 16:55:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 a92eff7..2a7c7c6 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
@@ -164,7 +164,7 @@
Assert.notNull(Id, "Id 不能为空");
int i = iTransactionEventService.deleteConfigById(Id);
if (i>0)
- return toAjax(iTransactionEventService.deleteConfigById(Id));
+ return ResultData.success("删除成功");
else
return ResultData.error("删除失败可能该工单有单据");
}
@@ -303,8 +303,11 @@
{
boolean a = false;
String fileName = file.getOriginalFilename();
- return null;
-
+ boolean b = iTransactionEventService.batchImport(fileName, file);
+ if (b){
+ return ResultData.success("导入成功");
+ }
+ return ResultData.error("导入失败");
}
--
Gitblit v1.7.1