From 1bf6cb4c0bfc149737afa37a1df1c809b29c6139 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 10 六月 2025 13:57:43 +0800
Subject: [PATCH] 点检测试修改

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java
index 4a8bed4..f84630f 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java
@@ -584,6 +584,15 @@
                 standard.setLoseEfficacyPerson(sysUser.getRealname());
                 dailyInspectionStandardService.updateById(standard);
             }
+            List<DailyInspectionStandard> list = dailyInspectionStandardService.lambdaQuery()
+                    .eq(DailyInspectionStandard::getEquipmentId, dailyInspectionStandard.getEquipmentId())
+                    .eq(DailyInspectionStandard::getVersionStatus, "2").list();
+            for (DailyInspectionStandard inspectionStandard : list) {
+                inspectionStandard.setVersionStatus("3");
+                inspectionStandard.setLoseEfficacyTime(new Date());
+                inspectionStandard.setLoseEfficacyPerson(sysUser.getRealname());
+                dailyInspectionStandardService.updateById(inspectionStandard);
+            }
             dailyInspectionStandard.setApprovalPerson(sysUser.getRealname());
             dailyInspectionStandard.setVersionStatus("2");
             dailyInspectionStandard.setTakeEffectTime(new Date());
@@ -662,7 +671,9 @@
             messageDTO.setContent(msg);
             messageDTO.setCategory(roleDictItem);
             messageDTO.setFromUser("鑷富缁存姢鐐规鏍囧噯绛惧娑堟伅鎻愰啋鎻愰啋灏忓姪鎵�");
-            messageDTO.setToUser(user.getUsername());
+            if(user != null){
+                messageDTO.setToUser(user.getUsername());
+            }
             sysBaseApi.sendSysAnnouncement(messageDTO);
         }
     }

--
Gitblit v1.9.3