From 24aa3dd763498a10600ca1f0f43160e2913ad98a Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 16 七月 2025 17:10:08 +0800
Subject: [PATCH] 三保状态修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceRequest.java | 4 ++--
lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java | 6 ++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java | 4 ++--
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java | 4 ++--
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java b/lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java
index 5ffcb6c..7de3bda 100644
--- a/lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java
+++ b/lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java
@@ -366,6 +366,12 @@
String YN_Y = "Y";
String YN_N = "N";
+ /**
+ * 1鏄�0鍚�
+ */
+ String YN_O = "0";
+ String YN_1 = "1";
+
/**===============================================================================================*/
/**
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java
index 3386e37..b5212d9 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java
@@ -118,14 +118,14 @@
*/
@Excel(name = "璁惧鍔熻兘鏄惁榻愬;鏄惁", width = 15)
@ApiModelProperty(value = "璁惧鍔熻兘鏄惁榻愬;鏄惁")
- @Dict(dicCode = "equipment_function_yn")
+ @Dict(dicCode = "yn")
private String fullyFunctional;
/**
* 璁惧鍔熻兘鏄惁榻愬;鏄惁
*/
@Excel(name = "璁惧鑳藉惁姝ｅ父杩愯浆;鏄惁", width = 15)
@ApiModelProperty(value = "璁惧鍔熻兘鏄惁榻愬;鏄惁")
- @Dict(dicCode = "equipment_function_yn")
+ @Dict(dicCode = "yn")
private String runningNormally;
/**
* 闂鎻忚堪
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 e0a2d9e..7d5977a 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
@@ -78,13 +78,13 @@
* 璁惧鍔熻兘鏄惁榻愬;鏄惁
*/
@ApiModelProperty(value = "璁惧鍔熻兘鏄惁榻愬;鏄惁")
- @Dict(dicCode = "equipment_function_yn")
+ @Dict(dicCode = "yn")
private String fullyFunctional;
/**
* 璁惧鍔熻兘鏄惁榻愬;鏄惁
*/
@ApiModelProperty(value = "璁惧鍔熻兘鏄惁姝ｅ父杩愯浆;鏄惁")
- @Dict(dicCode = "equipment_function_yn")
+ @Dict(dicCode = "yn")
private String runningNormally;
/**
* 闂鎻忚堪
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 7aa7229..e80c43f 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
@@ -375,7 +375,7 @@
values.put("dataId", order.getId());
values.put("organization", "鎶�鏈姸鎬侀壌瀹氱粨鏉�");
values.put("comment", "鎶�鏈姸鎬侀壌瀹氱粨鏉�");
- if (CommonConstant.YN_Y.equals(request.getFullyFunctional()) && CommonConstant.YN_Y.equals(request.getRunningNormally())) {
+ if (CommonConstant.YN_O.equals(request.getFullyFunctional()) && CommonConstant.YN_O.equals(request.getRunningNormally())) {
values.put("confirmation", "1");
// 鑾峰彇涓嬩竴姝ユ墽琛屼汉
userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0002);
@@ -522,7 +522,7 @@
order.setFullyFunctional(request.getFullyFunctional());
order.setRunningNormally(request.getRunningNormally());
order.setInspectTime(new Date());
- if (CommonConstant.YN_Y.equals(request.getFullyFunctional()) && CommonConstant.YN_Y.equals(request.getRunningNormally())) {
+ if (CommonConstant.YN_O.equals(request.getFullyFunctional()) && CommonConstant.YN_O.equals(request.getRunningNormally())) {
// 閴村畾閫氳繃
order.setMaintenanceStatus(ThirdMaintenanceStatusEnum.UNDER_MAINTENANCE.name());
} else {
--
Gitblit v1.9.3