From 8e54b9749f05e63c46f3b0488f7f86d4700ab747 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 16 七月 2025 17:44:55 +0800
Subject: [PATCH] 三保状态修改

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceRequest.java               |    4 ++--
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceRequest.java
index 7d5977a..845d146 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceRequest.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceRequest.java
@@ -79,13 +79,13 @@
      */
     @ApiModelProperty(value = "璁惧鍔熻兘鏄惁榻愬;鏄惁")
     @Dict(dicCode = "yn")
-    private String fullyFunctional;
+    private String fullyFunctionalResult;
     /**
      * 璁惧鍔熻兘鏄惁榻愬;鏄惁
      */
     @ApiModelProperty(value = "璁惧鍔熻兘鏄惁姝e父杩愯浆;鏄惁")
     @Dict(dicCode = "yn")
-    private String runningNormally;
+    private String runningNormallyResult;
     /**
      * 闂鎻忚堪
      */
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
index e80c43f..cdf64aa 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
@@ -519,10 +519,10 @@
                 case WAIT_CHECK:
                     // 鎶�鏈姸鎬侀壌瀹氱粨鏉�
                     order.setInspector(user.getUsername());
-                    order.setFullyFunctional(request.getFullyFunctional());
-                    order.setRunningNormally(request.getRunningNormally());
+                    order.setFullyFunctional(request.getFullyFunctionalResult());
+                    order.setRunningNormally(request.getRunningNormallyResult());
                     order.setInspectTime(new Date());
-                    if (CommonConstant.YN_O.equals(request.getFullyFunctional()) && CommonConstant.YN_O.equals(request.getRunningNormally())) {
+                    if (CommonConstant.YN_O.equals(request.getFullyFunctionalResult()) && CommonConstant.YN_O.equals(request.getRunningNormallyResult())) {
                         // 閴村畾閫氳繃
                         order.setMaintenanceStatus(ThirdMaintenanceStatusEnum.UNDER_MAINTENANCE.name());
                     } else {

--
Gitblit v1.9.3