From 56c963ca36d469bb661144bcabbc55da97c61220 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 14 五月 2025 11:05:19 +0800
Subject: [PATCH] art: 设备管理-周保-增加终验收抽检标记字段
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java | 9 ++++++++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamWeekMaintenanceRequest.java | 7 +++++--
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java | 7 +++++--
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamWeekMaintenanceQuery.java | 6 +++++-
4 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java
index 9393c2b..3e51a93 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java
@@ -139,9 +139,12 @@
/**缁堥獙鏀堕檮浠�*/
@ApiModelProperty(value = "缁堥獙鏀堕檮浠�")
private String finalAcceptanceFiles;
- /**鎶芥鏍囪*/
- @ApiModelProperty(value = "鎶芥鏍囪")
+ /**鍒濋獙鏀舵娊妫�鏍囪*/
+ @ApiModelProperty(value = "鍒濋獙鏀舵娊妫�鏍囪")
private String randomInspectionFlag;
+ /**缁堥獙鏀舵娊妫�鏍囪*/
+ @ApiModelProperty(value = "缁堥獙鏀舵娊妫�鏍囪")
+ private String finalRandomInspectionFlag;
//鍒楄〃灞曠ず
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamWeekMaintenanceQuery.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamWeekMaintenanceQuery.java
index 94aaddb..05e6d0d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamWeekMaintenanceQuery.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamWeekMaintenanceQuery.java
@@ -18,9 +18,13 @@
private Date maintenanceDateEnd;
private String maintenanceStatus;
/**
- * 鎶芥鏍囪
+ * 鍒濋獙鏀舵娊妫�鏍囪
*/
private String randomInspectionFlag;
+ /**
+ * 缁堥獙鏀舵娊妫�鏍囪
+ */
+ private String finalRandomInspectionFlag;
private String column;
private String order;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamWeekMaintenanceRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamWeekMaintenanceRequest.java
index 7fbb8bc..e27c301 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamWeekMaintenanceRequest.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamWeekMaintenanceRequest.java
@@ -77,8 +77,8 @@
/**鍒濋獙鏀堕檮浠�*/
@ApiModelProperty(value = "鍒濋獙鏀堕檮浠�")
private List<FileUploadResult> initialAcceptanceFilesResult;
- /**鎶芥鏍囪*/
- @ApiModelProperty(value = "鎶芥鏍囪")
+ /**鍒濋獙鎶芥鏍囪*/
+ @ApiModelProperty(value = "鍒濋獙鎶芥鏍囪")
private String randomInspectionFlag;
//缁堥獙鏀舵搷浣�
/**缁堥獙鏀舵剰瑙�*/
@@ -90,4 +90,7 @@
/**缁堥獙鏀堕檮浠�*/
@ApiModelProperty(value = "缁堥獙鏀堕檮浠�")
private List<FileUploadResult> finalAcceptanceFilesResult;
+ /**缁堥獙鎶芥鏍囪*/
+ @ApiModelProperty(value = "缁堥獙鎶芥鏍囪")
+ private String finalRandomInspectionFlag;
}
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