From 0cd305f943dd0f897928a784be5d0124a2faa851 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 02 六月 2025 11:10:23 +0800
Subject: [PATCH] art: 周保，详情添加字段
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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..269f5df 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
@@ -11,7 +11,6 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.beanutils.BeanUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
@@ -261,12 +260,14 @@
translateDictTextUtils.translateField("equipmentId", eamWeekMaintenanceOrder.getEquipmentId(), item, "eam_equipment,equipment_code,id");
translateDictTextUtils.translateField("standardId", eamWeekMaintenanceOrder.getStandardId(), item, "eam_maintenance_standard,standard_name,id");
translateDictTextUtils.translateField("operator", eamWeekMaintenanceOrder.getOperator(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("operatorPhone", eamWeekMaintenanceOrder.getOperator(), item, "sys_user,phone,username");
translateDictTextUtils.translateField("creationMethod", eamWeekMaintenanceOrder.getCreationMethod(), item, "order_creation_method");
translateDictTextUtils.translateField("maintenanceStatus", eamWeekMaintenanceOrder.getMaintenanceStatus(), item, "week_maintenance_status");
translateDictTextUtils.translateField("confirmUser", eamWeekMaintenanceOrder.getConfirmUser(), item, "sys_user,realname,username");
translateDictTextUtils.translateField("confirmDealType", eamWeekMaintenanceOrder.getConfirmDealType(), item, "approved_rejected");
translateDictTextUtils.translateField("initialAcceptanceUser", eamWeekMaintenanceOrder.getInitialAcceptanceUser(), item, "sys_user,realname,username");
translateDictTextUtils.translateField("finalAcceptanceUser", eamWeekMaintenanceOrder.getFinalAcceptanceUser(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("installationPosition", eamWeekMaintenanceOrder.getEquipmentId(), item, "eam_equipment,installation_position,id");
return Result.OK(item);
} catch (JsonProcessingException e) {
return Result.error("鏁版嵁杞瘧澶辫触锛�");
@@ -302,19 +303,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,12 +323,13 @@
|| 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());
try {
- BeanUtils.copyProperties(orderRequest, order);
+ orderRequest.setId(order.getId());
+ orderRequest.setEquipmentId(order.getEquipmentId());
//瀹℃壒淇℃伅
if (WeekMaintenanceStatusEnum.WAIT_CONFIRM.name().equals(order.getMaintenanceStatus())) {
orderRequest.setConfirmComment(request.getConfirmComment());
@@ -350,7 +352,7 @@
if (result == null) {
errorMsg.append("宸ュ崟鍙凤細");
errorMsg.append(order.getOrderNum());
- errorMsg.append(",瀹℃壒澶辫触!\r\n");
+ errorMsg.append(",瀹℃壒澶辫触!\n");
continue;
}
n++;
@@ -359,12 +361,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