From 9b00a4bf526c0f0d06ab5c1d1f80f52c7f384859 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 25 四月 2025 15:33:07 +0800
Subject: [PATCH] art: 设备管理-点检-换行
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java
index 8e22a0e..3e8e42b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java
@@ -302,19 +302,19 @@
@ApiOperation(value = "鍛ㄤ繚宸ュ崟-鎵归噺瀹℃壒娴佺▼", notes = "鍛ㄤ繚宸ュ崟-鎵归噺瀹℃壒娴佺▼")
@PostMapping("/batchApproval")
public Result<?> batchApproval(@RequestBody EamWeekMaintenanceBatchApprovalRequest request) {
- if (request == null || CollectionUtil.isEmpty(request.getTastList())) {
+ if (request == null || CollectionUtil.isEmpty(request.getTaskList())) {
return Result.error("娌℃湁闇�瑕佸鎵圭殑鏁版嵁锛�");
}
int n = 0;
StringBuilder errorMsg = new StringBuilder();
- List<WorkTaskDataVo> tastList = request.getTastList();
+ List<WorkTaskDataVo> tastList = request.getTaskList();
for (WorkTaskDataVo workTaskDataVo : tastList) {
EamWeekMaintenanceRequest orderRequest = new EamWeekMaintenanceRequest();
EamWeekMaintenanceOrder order = eamWeekMaintenanceOrderService.getById(workTaskDataVo.getDataId());
if (order == null) {
errorMsg.append("宸ュ崟ID锛�");
errorMsg.append(workTaskDataVo.getDataId());
- errorMsg.append(",涓嶅瓨鍦ㄦ垨宸茶鍒犻櫎!\r\n");
+ errorMsg.append(",涓嶅瓨鍦ㄦ垨宸茶鍒犻櫎!\n");
continue;
}
if (!(WeekMaintenanceStatusEnum.WAIT_CONFIRM.name().equals(order.getMaintenanceStatus())
@@ -322,7 +322,7 @@
|| WeekMaintenanceStatusEnum.WAIT_FINAL_ACCEPTANCE.name().equals(order.getMaintenanceStatus()))) {
errorMsg.append("宸ュ崟鍙凤細");
errorMsg.append(order.getOrderNum());
- errorMsg.append(",鐘舵�佹棤娉曟壒閲忓鎵�!\r\n");
+ errorMsg.append(",鐘舵�佹棤娉曟壒閲忓鎵�!\n");
continue;
}
List<EamWeekMaintenanceOrderDetail> tableDetailList = weekMaintenanceOrderDetailService.queryListByOrderId(order.getId());
@@ -350,7 +350,7 @@
if (result == null) {
errorMsg.append("宸ュ崟鍙凤細");
errorMsg.append(order.getOrderNum());
- errorMsg.append(",瀹℃壒澶辫触!\r\n");
+ errorMsg.append(",瀹℃壒澶辫触!\n");
continue;
}
n++;
@@ -359,12 +359,12 @@
errorMsg.append("宸ュ崟鍙凤細");
errorMsg.append(order.getOrderNum());
errorMsg.append(",瀹℃壒澶辫触,閿欒鍘熷洜:");
- errorMsg.append(e.getMessage() + "\r\n");
+ errorMsg.append(e.getMessage() + "\n");
}
}
if (n > 0) {
- String message = "鎴愬姛瀹℃壒閫氳繃" + n + "鏉¤褰曪紒\r\n" + errorMsg;
+ String message = "鎴愬姛瀹℃壒閫氳繃" + n + "鏉¤褰曪紒\n" + errorMsg;
return Result.OK(message);
}
return Result.error(errorMsg.toString());
--
Gitblit v1.9.3