From 548de3053898bc6571c90d014a40050c39a7d195 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期六, 02 八月 2025 15:33:07 +0800
Subject: [PATCH] 二保添加流转节点
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java | 102 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 73 insertions(+), 29 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 e6f9f67..11a2161 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
@@ -30,6 +30,7 @@
import javax.servlet.http.HttpServletRequest;
import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* @Description: 淇濆吇鏍囧噯
@@ -232,15 +233,17 @@
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
List<String> list = Arrays.asList(ids.split(","));
+ AtomicInteger i = new AtomicInteger();
list.forEach(id -> {
EamMaintenanceStandard entity = eamMaintenanceStandardService.getById(id);
if (entity != null&&entity.getStandardStatus().equals(MaintenanceStandardStatusEnum.WAIT_SUBMIT.name())) {
//鍙垹闄ょ姸鎬佷负寰呮彁浜ょ殑
+ i.getAndIncrement();
entity.setDelFlag(CommonConstant.DEL_FLAG_1);
eamMaintenanceStandardService.updateById(entity);
}
});
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛,宸插垹闄ょ姸鎬佷负寰呮彁浜ょ殑淇濆吇鏍囧噯锛屽垹闄ゆ暟閲忎负"+i);
}
/**
@@ -282,18 +285,18 @@
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
MultipartFile file = entity.getValue();
- file.getOriginalFilename();
- return eamMaintenanceStandardService.importPointInspectionExcel(file);
+ String fileName = file.getOriginalFilename();
+ Result<?> importResult=eamMaintenanceStandardService.importPointInspectionExcel(file,null);
+ if (importResult.isSuccess()) {
+ successCount++;
+ } else {
+ results.put(fileName, importResult.getMessage());
+ failureCount++;
+ }
}
- // 鏋勫缓鍝嶅簲
- Map<String, Object> response = new HashMap<>();
- response.put("results", results);
- response.put("totalFiles", fileMap.size());
- response.put("successCount", successCount);
- response.put("failureCount", failureCount);
-
- return Result.ok("瀵煎叆瀹屾垚" + response);
+ // 鏋勫缓鏈�缁堝搷搴�
+ return getResult(results, fileMap.size(), successCount, failureCount);
} catch (Exception e) {
log.error("鐐规瀵煎叆澶勭悊寮傚父", e);
@@ -318,18 +321,18 @@
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
MultipartFile file = entity.getValue();
- file.getOriginalFilename();
- return eamMaintenanceStandardService.importMaintenanceStandard(file, "SECOND");
+ String fileName = file.getOriginalFilename();
+ Result<?> importResult=eamMaintenanceStandardService.importMaintenanceStandard(file, "SECOND",null);
+ if (importResult.isSuccess()) {
+ successCount++;
+ } else {
+ results.put(fileName, importResult.getMessage());
+ failureCount++;
+ }
}
// 鏋勫缓鏈�缁堝搷搴�
- Map<String, Object> response = new HashMap<>();
- response.put("results", results);
- response.put("totalFiles", fileMap.size());
- response.put("successCount", successCount);
- response.put("failureCount", failureCount);
-
- return Result.ok("瀵煎叆瀹屾垚"+response);
+ return getResult(results, fileMap.size(), successCount, failureCount);
} catch (Exception e) {
log.error("瀵煎叆澶勭悊寮傚父", e);
@@ -353,18 +356,18 @@
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
MultipartFile file = entity.getValue();
- file.getOriginalFilename();
- return eamMaintenanceStandardService.importMaintenanceStandard(file, "THIRD");
+ String fileName = file.getOriginalFilename();
+ Result<?> importResult= eamMaintenanceStandardService.importMaintenanceStandard(file, "THIRD",null);
+ if (importResult.isSuccess()) {
+ successCount++;
+ } else {
+ results.put(fileName, importResult.getMessage());
+ failureCount++;
+ }
}
// 鏋勫缓鏈�缁堝搷搴�
- Map<String, Object> response = new HashMap<>();
- response.put("results", results);
- response.put("totalFiles", fileMap.size());
- response.put("successCount", successCount);
- response.put("failureCount", failureCount);
-
- return Result.ok("瀵煎叆瀹屾垚"+response);
+ return getResult(results, fileMap.size(), successCount, failureCount);
} catch (Exception e) {
log.error("瀵煎叆澶勭悊寮傚父", e);
@@ -372,4 +375,45 @@
}
}
+ /**
+ * 鍗囩増瀵煎叆
+ * @param id,file
+ * @return
+ */
+ @ApiOperation(value = "鍗囩増瀵煎叆", notes = "鍗囩増瀵煎叆")
+ @PostMapping(value = "/importUpgrade")
+ public Result<?> importUpgrade(String id,MultipartFile file) {
+ EamMaintenanceStandard eamMaintenanceStandard=eamMaintenanceStandardService.getById(id);
+ if (eamMaintenanceStandard==null) {
+ return Result.error("璇烽�夋嫨闇�瑕佸崌鐗堢殑淇濆吇鏍囧噯");
+ }else {
+ switch (eamMaintenanceStandard.getMaintenanceCategory()){
+ case "POINT_INSPECTION":
+ //鐐规鍗囩増瀵煎叆
+ return eamMaintenanceStandardService.importPointInspectionExcel(file,id);
+ case "SECOND_MAINTENANCE":
+ //浜屼繚鍗囩増瀵煎叆
+ return eamMaintenanceStandardService.importMaintenanceStandard(file, "SECOND",id);
+ case "THIRD_MAINTENANCE":
+ //涓変繚鍗囩増瀵煎叆
+ return eamMaintenanceStandardService.importMaintenanceStandard(file, "THIRD",id);
+ default:
+ break;
+ }
+ }
+ return Result.error("鍗囩増瀵煎叆澶辫触");
+ }
+
+ private Result<?> getResult(Map<String, String> results, int fileCount, int successCount, int failureCount) {
+ List<String> response = new ArrayList<>();
+ response.add("鎬绘枃浠舵暟锛�" + fileCount);
+ response.add("鎴愬姛鏁帮細" + successCount);
+ response.add("澶辫触鏁帮細" + failureCount);
+ if (failureCount > 0) {
+ response.add("閿欒淇℃伅锛�" + results.values());
+ return Result.error("閮ㄥ垎鏂囦欢瀵煎叆澶辫触锛�" + response);
+ }
+ return Result.ok("鎵�鏈夋枃浠跺鍏ユ垚鍔燂細" + response);
+ }
+
}
--
Gitblit v1.9.3