From 9a9697c55fa66821cf74165ac2ae820182dae94d Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 23 七月 2025 17:41:53 +0800
Subject: [PATCH] 设备维修对应接口
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
index 89cdf03..8faaf0a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
@@ -430,6 +430,9 @@
userApprovalList= userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
values.put("NextAssignee", userApprovalList);
values.put("dataId", entity.getId());
+ if (StrUtil.isEmpty(request.getDealDescription())){
+ request.setDealDescription("");
+ }
values.put("organization",request.getDealDescription());
values.put("comment", request.getDealDescription());
values.put("manageUserResult",request.getManageUserResult());
@@ -440,10 +443,16 @@
entity.setDealDescription(request.getDealDescription());
entity.setConfirmTime(new Date());
request.setComment(request.getDealDescription());
+ if (request.getManageUserResult().equals("2")){
+ entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.REJECTED.name());
+ }
}
break;
case WAIT_INSPECTOR_CONFIRM:
//妫�鏌ヤ汉纭
+ if (StrUtil.isEmpty(request.getDealDescription())){
+ request.setDealDescription("");
+ }
values.put("dataId", entity.getId());
values.put("organization",request.getInspectConfirmComment());
values.put("comment", request.getInspectConfirmComment());
@@ -454,6 +463,9 @@
entity.setInspectConfirmComment(request.getInspectConfirmComment());
entity.setInspectConfirmTime(new Date());
request.setComment(request.getDealDescription());
+ if (request.getInspectorResult().equals("2")){
+ entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.REJECTED.name());
+ }
break;
default:
throw new JeecgBootException("瀹℃壒澶辫触");
--
Gitblit v1.9.3