From dd5f82bb38e40af080569923e1e93576a79d15a4 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 05 九月 2025 16:52:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
index ea48b01..81ed54b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
@@ -221,7 +221,11 @@
             //鏇存柊璁惧缁翠慨鐘舵��
             eamEquipmentExtendService.updateEquipmentRepairStatus(eamReportRepair.getEquipmentId(), EquipmentRepairStatus.UNDER_REPAIR.name());
             //鎺ㄩ�佷紒涓氬井淇℃秷鎭�
-            sendQywxTemplateCardMessage(eamRepairOrder, eamReportRepair, null);
+            try {
+                sendQywxTemplateCardMessage(eamRepairOrder, eamReportRepair, null);
+            } catch (Exception e) {
+                log.error("鎺ㄩ�佷紒涓氬井淇℃秷鎭け璐ワ細" + e.getMessage(), e);
+            }
         }
     }
 
@@ -268,7 +272,11 @@
             //鏇存柊璁惧缁翠慨鐘舵��
             eamEquipmentExtendService.updateEquipmentRepairStatus(eamReportRepair.getEquipmentId(), EquipmentRepairStatus.UNDER_REPAIR.name());
             //鎺ㄩ�佷紒涓氬井淇℃秷鎭�
-            sendQywxTemplateCardMessage(eamRepairOrder, null, null);
+            try {
+                sendQywxTemplateCardMessage(eamRepairOrder, null, null);
+            } catch (Exception e) {
+                log.error("鎺ㄩ�佷紒涓氬井淇℃秷鎭け璐ワ細" + e.getMessage(), e);
+            }
         }
     }
 
@@ -547,7 +555,11 @@
         eamReportRepairService.updateById(eamReportRepair);
         if (!ReportRepairEnum.COMPLETE.name().equals(eamRepairOrder.getRepairStatus())) {
             //鎺ㄩ�佷紒涓氬井淇℃秷鎭紙娴佺▼瀹岀粨涓嶅彂閫佹秷鎭級
-            sendQywxTemplateCardMessage(eamRepairOrder, eamReportRepair, request);
+            try {
+                sendQywxTemplateCardMessage(eamRepairOrder, eamReportRepair, request);
+            } catch (Exception e) {
+                log.error("鎺ㄩ�佷紒涓氬井淇℃秷鎭け璐ワ細" + e.getMessage(), e);
+            }
         }
         return eamRepairOrder;
     }

--
Gitblit v1.9.3