From e70c3d7a34ad9e9023abd9fc669bdf4e4a082a38 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 09 七月 2025 15:59:42 +0800
Subject: [PATCH] 增加code唯一校验，修改导入返回值
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java | 59 +++++++++--------------------------------------------------
1 files changed, 9 insertions(+), 50 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
index 754130c..e6f9f67 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
@@ -282,17 +282,8 @@
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
MultipartFile file = entity.getValue();
- String fileName = file.getOriginalFilename();
-
- Result<?> importResult = eamMaintenanceStandardService.importPointInspectionExcel(file);
-
- if (importResult.isSuccess()) {
- results.put(fileName, "鎴愬姛: " + importResult.getMessage());
- successCount++;
- } else {
- results.put(fileName, "澶辫触: " + importResult.getMessage());
- failureCount++;
- }
+ file.getOriginalFilename();
+ return eamMaintenanceStandardService.importPointInspectionExcel(file);
}
// 鏋勫缓鍝嶅簲
@@ -302,13 +293,7 @@
response.put("successCount", successCount);
response.put("failureCount", failureCount);
- if (failureCount == 0) {
- return Result.ok("鎵�鏈夌偣妫�鏂囦欢瀵煎叆鎴愬姛"+response);
- } else if (successCount == 0) {
- return Result.error("鎵�鏈夌偣妫�鏂囦欢瀵煎叆澶辫触", response);
- } else {
- return Result.error("閮ㄥ垎鐐规鏂囦欢瀵煎叆澶辫触", response);
- }
+ return Result.ok("瀵煎叆瀹屾垚" + response);
} catch (Exception e) {
log.error("鐐规瀵煎叆澶勭悊寮傚父", e);
@@ -333,17 +318,8 @@
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
MultipartFile file = entity.getValue();
- String fileName = file.getOriginalFilename();
-
- Result<?> importResult = eamMaintenanceStandardService.importMaintenanceStandard(file, "SECOND");
-
- if (importResult.isSuccess()) {
- results.put(fileName, "鎴愬姛: " + importResult.getMessage());
- successCount++;
- } else {
- results.put(fileName, "澶辫触: " + importResult.getMessage());
- failureCount++;
- }
+ file.getOriginalFilename();
+ return eamMaintenanceStandardService.importMaintenanceStandard(file, "SECOND");
}
// 鏋勫缓鏈�缁堝搷搴�
@@ -353,11 +329,7 @@
response.put("successCount", successCount);
response.put("failureCount", failureCount);
- if (failureCount > 0) {
- return Result.error("閮ㄥ垎鏂囦欢瀵煎叆澶辫触", response);
- }
-
- return Result.ok("鎵�鏈夋枃浠跺鍏ユ垚鍔�"+response);
+ return Result.ok("瀵煎叆瀹屾垚"+response);
} catch (Exception e) {
log.error("瀵煎叆澶勭悊寮傚父", e);
@@ -381,17 +353,8 @@
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
MultipartFile file = entity.getValue();
- String fileName = file.getOriginalFilename();
-
- Result<?> importResult = eamMaintenanceStandardService.importMaintenanceStandard(file, "THIRD");
-
- if (importResult.isSuccess()) {
- results.put(fileName, "鎴愬姛: " + importResult.getMessage());
- successCount++;
- } else {
- results.put(fileName, "澶辫触: " + importResult.getMessage());
- failureCount++;
- }
+ file.getOriginalFilename();
+ return eamMaintenanceStandardService.importMaintenanceStandard(file, "THIRD");
}
// 鏋勫缓鏈�缁堝搷搴�
@@ -401,11 +364,7 @@
response.put("successCount", successCount);
response.put("failureCount", failureCount);
- if (failureCount > 0) {
- return Result.error("閮ㄥ垎鏂囦欢瀵煎叆澶辫触", response);
- }
-
- return Result.ok("鎵�鏈夋枃浠跺鍏ユ垚鍔�"+response);
+ return Result.ok("瀵煎叆瀹屾垚"+response);
} catch (Exception e) {
log.error("瀵煎叆澶勭悊寮傚父", e);
--
Gitblit v1.9.3