From c6976365d5bfb39a32db8b541b1fe3ceb30c7826 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 14 二月 2025 10:03:17 +0800
Subject: [PATCH] Merge branch 'dev'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
index 6a08556..f1c0a34 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
@@ -1,5 +1,6 @@
package com.ycl.platform.domain.query;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsQuery;
import enumeration.general.WorkOrderStatusEnum;
@@ -8,6 +9,7 @@
import lombok.experimental.Accessors;
import java.util.Date;
+import java.util.List;
/**
* 宸ュ崟鏌ヨ
@@ -23,28 +25,37 @@
/**
* 宸ュ崟鍙�
*/
- private String workOrderNo;
+ private String keyword;
/**
* 杩愮淮澶勭悊鏃堕棿
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date start;
/**
* 杩愮淮澶勭悊鏃堕棿
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date end;
/**
* 鏁呴殰绫诲瀷
*/
private String errorType;
-
+ private List<String> errorTypeList;
+ /**
+ * 鏁呴殰绫诲瀷
+ */
+ private String errorTypeLabel;
/**
* 鐘舵��
*/
- private WorkOrderStatusEnum status = WorkOrderStatusEnum.DISTRIBUTED;
+ private String status;
+
+ /**
+ * 鍗曚綅id
+ */
+ private Integer unitId;
}
--
Gitblit v1.8.0