From 770ee9e6da54222cb74f648863262648f1c32331 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 16 七月 2025 11:44:20 +0800
Subject: [PATCH] 二保流程代码

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java |    5 +++++
 1 files changed, 5 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 e59f21d..26c65af 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
@@ -114,6 +114,9 @@
         }
         //鏌ヨ鏉′欢杩囨护
         if (query != null) {
+            if (StringUtils.isNotBlank(query.getId())){
+                queryWrapper.eq("wmo.id", query.getId());
+            }
             if (StringUtils.isNotBlank(query.getEquipmentId())) {
                 queryWrapper.eq("wmo.equipment_id", query.getEquipmentId());
             }
@@ -374,6 +377,7 @@
                     entity.setOperator(user.getUsername());
                     values.put("organization", "浜屼繚鎿嶄綔宸ユ墽琛岀粨鏉�");
                     values.put("comment", "浜屼繚鎿嶄綔宸ユ墽琛岀粨鏉�");
+                    request.setComment("浜屼繚鎿嶄綔宸ユ墽琛岀粨鏉�");
                     //澶勭悊瀵瑰簲璇︽儏
                     if (CollectionUtils.isNotEmpty(request.getOperatorDetailList())){
                         //鍒犻櫎鍘熸湁鏁版嵁
@@ -395,6 +399,7 @@
                     entity.setRepairman(user.getUsername());
                     values.put("organization", "浜屼繚缁翠慨宸ユ墽琛岀粨鏉�");
                     values.put("comment", "浜屼繚缁翠慨宸ユ墽琛岀粨鏉�");
+                    request.setComment("浜屼繚缁翠慨宸ユ墽琛岀粨鏉�");
                     //澶勭悊瀵瑰簲璇︽儏
                     if (CollectionUtils.isNotEmpty(request.getRepairmanDetailList())){
                         //鍒犻櫎鍘熸湁鏁版嵁

--
Gitblit v1.9.3