From ed48aa9f30a87c528f071d06bf6b59d7d15428e9 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 26 五月 2025 16:12:55 +0800
Subject: [PATCH] 点检报表后端
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java
index 5024a02..30aaa10 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java
@@ -201,6 +201,9 @@
Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId());
List<MaintenanceCycleVo> maintenanceCycle = maintenanceStandardService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType());
+ if(maintenanceCycle.size()==0){
+ return Result.OK("娌℃湁鎵惧埌鐨勪繚鍏诲懆鏈燂紝璇峰厛缁存姢淇濆吇鍛ㄦ湡!");
+ }
List<MaintenanceStandardDetail> maintenanceStandardDetaillist = maintenanceStandard.getMaintenanceStandardDetaillist();
for (MaintenanceStandardDetail maintenanceStandardDetail : maintenanceStandardDetaillist) {
if(maintenanceCycle.size() > 0){
@@ -240,6 +243,9 @@
//2.閲嶆柊鎸佷箙淇濆吇椤圭洰
Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId());
List<MaintenanceCycleVo> maintenanceCycle = maintenanceStandardService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType());
+ if(maintenanceCycle.size()==0){
+ return Result.OK("娌℃湁鎵惧埌鐨勪繚鍏诲懆鏈燂紝璇峰厛缁存姢淇濆吇鍛ㄦ湡!");
+ }
List<MaintenanceStandardDetail> maintenanceStandardDetails = maintenanceStandard.getMaintenanceStandardDetaillist();
for (MaintenanceStandardDetail maintenanceStandardDetail : maintenanceStandardDetails) {
if(maintenanceCycle.size() > 0){
@@ -336,6 +342,7 @@
LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
String exceptionInfo = "";
+ String msgInfo = "";
int exceptionNum = 0;
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
MultipartFile file = entity.getValue();
@@ -375,10 +382,12 @@
maintenanceStandardService.save(maintenanceStandard);
}
else {
+ msgInfo += equipment.getNum()+ ",";
continue;
}
}
else {
+
continue;
}
}
@@ -475,6 +484,7 @@
maintenanceStandardService.save(maintenanceStandard);
}
else {
+ msgInfo += equipment.getNum()+ ",";
continue;
}
}
@@ -527,7 +537,11 @@
}
}
}
- return Result.OK("瀵煎叆鎴愬姛");
+ if(msgInfo == ""){
+ return Result.OK("瀵煎叆鎴愬姛");
+ }else{
+ return Result.OK("缁熶竴缂栫爜鏄細"+msgInfo+"鐨勪繚鍏绘爣鍑嗗凡瀛樺湪锛岃鍏堟墜鍔ㄥけ鏁堝啀閲嶆柊瀵煎叆!");
+ }
} else {
System.out.println("鏃犳硶瑙ｆ瀽璇ユ枃浠�");
}
--
Gitblit v1.9.3