From d3749bb6d1cf618ac0c5dafe09160d76dd2d3e26 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 12 五月 2025 14:15:14 +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 | 3 +++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java | 3 +++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamWeekMaintenanceQuery.java | 4 ++++
4 files changed, 19 insertions(+), 0 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 260f414..9393c2b 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,6 +139,9 @@
/**缁堥獙鏀堕檮浠�*/
@ApiModelProperty(value = "缁堥獙鏀堕檮浠�")
private String finalAcceptanceFiles;
+ /**鎶芥鏍囪*/
+ @ApiModelProperty(value = "鎶芥鏍囪")
+ private String randomInspectionFlag;
//鍒楄〃灞曠ず
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 aeef9cf..94aaddb 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
@@ -17,6 +17,10 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date maintenanceDateEnd;
private String maintenanceStatus;
+ /**
+ * 鎶芥鏍囪
+ */
+ private String randomInspectionFlag;
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 c2f7ecf..7fbb8bc 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,6 +77,9 @@
/**鍒濋獙鏀堕檮浠�*/
@ApiModelProperty(value = "鍒濋獙鏀堕檮浠�")
private List<FileUploadResult> initialAcceptanceFilesResult;
+ /**鎶芥鏍囪*/
+ @ApiModelProperty(value = "鎶芥鏍囪")
+ private String randomInspectionFlag;
//缁堥獙鏀舵搷浣�
/**缁堥獙鏀舵剰瑙�*/
@ApiModelProperty(value = "缁堥獙鏀舵剰瑙�")
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 dc69929..d8c2236 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
@@ -178,6 +178,14 @@
if (query.getMaintenanceDateBegin() != null && query.getMaintenanceDateEnd() != null) {
queryWrapper.between("wmo.maintenance_date", query.getMaintenanceDateBegin(), query.getMaintenanceDateEnd());
}
+ if(StringUtils.isNotBlank(query.getRandomInspectionFlag())) {
+ if(CommonConstant.DEFAULT_1.equals(query.getRandomInspectionFlag())) {
+ queryWrapper.eq("wmo.random_inspection_flag", CommonConstant.DEFAULT_1);
+ }else {
+ queryWrapper.and(q -> q.eq("wmo.random_inspection_flag", CommonConstant.DEFAULT_0).or().isNull("wmo.random_inspection_flag"));
+ }
+
+ }
//鎺掑簭
if (StringUtils.isNotBlank(query.getColumn()) && StringUtils.isNotBlank(query.getOrder())) {
String column = query.getColumn();
@@ -444,6 +452,7 @@
entity.setInitialAcceptanceUser(user.getUsername());
entity.setInitialAcceptanceComment(request.getInitialAcceptanceComment());
entity.setInitialAcceptanceTime(new Date());
+ entity.setRandomInspectionFlag(request.getRandomInspectionFlag());
//澶勭悊闄勪欢
if (CollectionUtil.isNotEmpty(request.getInitialAcceptanceFilesResult())) {
List<FileUploadResult> fileUploadResultList = request.getInitialAcceptanceFilesResult();
--
Gitblit v1.9.3