From 5d5675fd6b6521c3d3e5887017a090c60897f6cd Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 15 五月 2025 14:18:40 +0800
Subject: [PATCH] bug修复
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
index d8c2236..3f41ea5 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
@@ -184,7 +184,13 @@
}else {
queryWrapper.and(q -> q.eq("wmo.random_inspection_flag", CommonConstant.DEFAULT_0).or().isNull("wmo.random_inspection_flag"));
}
-
+ }
+ if(StringUtils.isNotBlank(query.getFinalRandomInspectionFlag())) {
+ if(CommonConstant.DEFAULT_1.equals(query.getFinalRandomInspectionFlag())) {
+ queryWrapper.eq("wmo.final_random_inspection_flag", CommonConstant.DEFAULT_1);
+ }else {
+ queryWrapper.and(q -> q.eq("wmo.final_random_inspection_flag", CommonConstant.DEFAULT_0).or().isNull("wmo.final_random_inspection_flag"));
+ }
}
//鎺掑簭
if (StringUtils.isNotBlank(query.getColumn()) && StringUtils.isNotBlank(query.getOrder())) {
@@ -475,6 +481,7 @@
entity.setFinalAcceptanceUser(user.getUsername());
entity.setFinalAcceptanceComment(request.getFinalAcceptanceComment());
entity.setFinalAcceptanceTime(new Date());
+ entity.setFinalRandomInspectionFlag(request.getFinalRandomInspectionFlag());
//澶勭悊闄勪欢
if (CollectionUtil.isNotEmpty(request.getFinalAcceptanceFilesResult())) {
List<FileUploadResult> fileUploadResultList = request.getFinalAcceptanceFilesResult();
--
Gitblit v1.9.3