From 96271372957a94cc290783aba40ad9c65f96e0b2 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 17 七月 2025 14:19:13 +0800
Subject: [PATCH] 三保领取状态调整
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java | 2 +-
db/LS/dict_ls.sql | 13 ++++++-------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/db/LS/dict_ls.sql b/db/LS/dict_ls.sql
index 3df815d..f33727c 100644
--- a/db/LS/dict_ls.sql
+++ b/db/LS/dict_ls.sql
@@ -56,15 +56,14 @@
INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1945421898058391553', N'1945421792382902274', N'寮傚父', N'ANOMALY', '', 2, 1, N'admin', '2025-07-16 17:54:59.3460000', NULL, NULL);
---璁惧鍔熻兘鏄惁
-delete from [dbo].[sys_dict_item] where dict_id in (select id from [dbo].[sys_dict] where dict_code='equipment_function_yn');
-delete from [dbo].[sys_dict] where dict_code='equipment_function_yn';
+--楠屾敹鐘舵��
+delete from [dbo].[sys_dict_item] where dict_id in (select id from [dbo].[sys_dict] where dict_code='check_status');
+delete from [dbo].[sys_dict] where dict_code='check_status';銆�
-INSERT INTO [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'1945027073496698882', N'璁惧鍔熻兘鏄惁', N'equipment_function_yn', N'璁惧绠＄悊浣跨敤', 0, N'admin', '2025-07-15 15:46:05.8310000', NULL, NULL, NULL);
+INSERT INTO [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'1717074172248702977', N'涓変繚楠屾敹鐘舵��', N'check_status', '', 0, N'admin', '2023-10-25 15:02:39.0090000', NULL, NULL, NULL);
-INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1945027150818693122', N'1945027073496698882', N'鏄�', N'Y', '', 1, 1, N'admin', '2025-07-15 15:46:24.2780000', NULL, NULL);
-INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1945027186277339138', N'1945027073496698882', N'鍚�', N'N', '', 2, 1, N'admin', '2025-07-15 15:46:32.7290000', NULL, NULL);
-
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1717074234504757249', N'1717074172248702977', N'閫氳繃', N'1', '', 1, 1, N'admin', '2023-10-25 15:02:53.8610000', NULL, NULL);
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1717074268809969665', N'1717074172248702977', N'鏈�氳繃', N'2', '', 1, 1, N'admin', '2023-10-25 15:03:02.0350000', NULL, NULL);
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 6856be4..2ae822a 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
@@ -251,7 +251,7 @@
if (entity == null) {
throw new JeecgBootException("瑕侀鍙栫殑宸ュ崟涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
}
- if (!ThirdMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
+ if (!ThirdMaintenanceStatusEnum.WAIT_CHECK.name().equals(entity.getMaintenanceStatus())) {
throw new JeecgBootException("璇ュ伐鍗曞凡杩涜杩囬鍙栵紒");
}
EamEquipment equipment = eamEquipmentService.getById(entity.getEquipmentId());
--
Gitblit v1.9.3