From ba614fbd8836f9bcce04ab4177b06329bed0b651 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 18 七月 2024 15:10:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderBatchAuditingForm.java | 4 ++--
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderBatchAuditingForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderBatchAuditingForm.java
index f0059e8..2bf9e6f 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderBatchAuditingForm.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderBatchAuditingForm.java
@@ -30,7 +30,7 @@
/**
* 鏁呴殰绫诲瀷
*/
- @NotBlank(message = "鏁呴殰绫诲瀷涓嶈兘涓虹┖")
- private String errorType;
+ @NotEmpty(message = "鏁呴殰绫诲瀷涓嶈兘涓虹┖")
+ private List<String> errorTypes;
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index 67a558c..3e25f5b 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -132,7 +132,7 @@
// 鏍规嵁鏁呴殰绫诲瀷鑾峰彇鍒楄〃
List<WorkOrder> list = new LambdaQueryChainWrapper<>(baseMapper)
.in(WorkOrder::getStatus, WorkOrderStatusEnum.YW_HANDLE.getValue())
- .eq(WorkOrder::getErrorType, form.getErrorType())
+ .in(WorkOrder::getErrorType, form.getErrorTypes())
.select(WorkOrder::getId, WorkOrder::getUnitId, WorkOrder::getWorkOrderNo)
.list();
if (list.isEmpty()) {
--
Gitblit v1.8.0