From dab9e6bb95925acaf3ca21eb1b3e66a6ebc73b32 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 11 十一月 2022 14:05:06 +0800
Subject: [PATCH] 修改导办人员修改手机号报错 bug
---
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 13 ++++++++++---
1 files changed, 10 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..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
@@ -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,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