From c113f78cdc23b0da774c91cab418784f156ee7d3 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 02 六月 2025 10:49:11 +0800
Subject: [PATCH] art: 点检 详情添加字段
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
index 61eaea9..b281684 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
@@ -10,8 +10,6 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.beanutils.BeanMap;
-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;
@@ -34,7 +32,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;
import java.util.List;
@@ -187,30 +184,31 @@
@ApiOperation(value = "鐐规宸ュ崟-鎵归噺瀹℃壒娴佺▼", notes = "鐐规宸ュ崟-鎵归噺瀹℃壒娴佺▼")
@PostMapping("/batchApproval")
public Result<?> batchApproval(@RequestBody EamInspectionBatchApprovalRequest 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) {
EamInspectionOrderRequest orderRequest = new EamInspectionOrderRequest();
EamInspectionOrder order = eamInspectionOrderService.getById(workTaskDataVo.getDataId());
if(order == null) {
errorMsg.append("宸ュ崟ID锛�");
errorMsg.append(workTaskDataVo.getDataId());
- errorMsg.append(",涓嶅瓨鍦ㄦ垨宸茶鍒犻櫎!\r\n");
+ errorMsg.append(",涓嶅瓨鍦ㄦ垨宸茶鍒犻櫎!\n");
continue;
}
if(!InspectionStatus.WAIT_CONFIRM.name().equals(order.getInspectionStatus())) {
errorMsg.append("宸ュ崟鍙凤細");
errorMsg.append(order.getOrderNum());
- errorMsg.append(",鐘舵�佹棤娉曟壒閲忓鎵�!\r\n");
+ errorMsg.append(",鐘舵�佹棤娉曟壒閲忓鎵�!\n");
continue;
}
List<EamInspectionOrderDetail> tableDetailList = eamInspectionOrderDetailService.queryListByOrderId(order.getId());
try {
- BeanUtils.copyProperties(orderRequest, order);
+ orderRequest.setId(order.getId());
+ orderRequest.setEquipmentId(order.getEquipmentId());
//瀹℃壒淇℃伅
orderRequest.setConfirmComment(request.getConfirmComment());
orderRequest.setConfirmDealType(request.getConfirmDealType());
@@ -225,7 +223,7 @@
if(result == null) {
errorMsg.append("宸ュ崟鍙凤細");
errorMsg.append(order.getOrderNum());
- errorMsg.append(",瀹℃壒澶辫触!\r\n");
+ errorMsg.append(",瀹℃壒澶辫触!\n");
continue;
}
n++;
@@ -234,12 +232,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());
@@ -295,10 +293,12 @@
translateDictTextUtils.translateField("createBy", eamInspectionOrder.getCreateBy(), item, "sys_user,realname,username");
translateDictTextUtils.translateField("standardId", eamInspectionOrder.getStandardId(), item, "eam_maintenance_standard,standard_name,id");
translateDictTextUtils.translateField("operator", eamInspectionOrder.getOperator(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("operatorPhone", eamInspectionOrder.getOperator(), item, "sys_user,phone,username");
translateDictTextUtils.translateField("creationMethod", eamInspectionOrder.getCreationMethod(), item, "order_creation_method");
translateDictTextUtils.translateField("inspectionStatus", eamInspectionOrder.getInspectionStatus(), item, "inspection_status");
translateDictTextUtils.translateField("confirmUser", eamInspectionOrder.getConfirmUser(), item, "sys_user,realname,username");
translateDictTextUtils.translateField("confirmDealType", eamInspectionOrder.getConfirmDealType(), item, "approved_rejected");
+ translateDictTextUtils.translateField("installationPosition", eamInspectionOrder.getEquipmentId(), item, "eam_equipment,installation_position,id");
return Result.OK(item);
} catch (JsonProcessingException e) {
return Result.error("鏁版嵁杞瘧澶辫触锛�");
--
Gitblit v1.9.3