From 4371080df058a549cdaf31dddeca6c5fee58e23b Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期二, 10 六月 2025 15:31:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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