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/DistributeWorkOrderQuery.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DistributeWorkOrderQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DistributeWorkOrderQuery.java
index c1f4c82..80c1b08 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DistributeWorkOrderQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DistributeWorkOrderQuery.java
@@ -1,15 +1,11 @@
package com.ycl.platform.domain.query;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.ycl.platform.base.AbsQuery;
-import enumeration.general.FastDistributeTypeEnum;
-import enumeration.general.WorkOrderStatusEnum;
import io.swagger.annotations.ApiModel;
-import jakarta.validation.constraints.Min;
-import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;
@@ -32,10 +28,16 @@
private Integer unitId;
/**
+ * 鏁呴殰绫诲瀷
+ */
+ private String errorType;
+ private List<String> errorTypeList;
+
+ /**
* 宸ュ崟id
*/
@JsonProperty("ids")
- private List<Integer> ids;
+ private List<String> workOrderNOList;
/**
* 鍏抽敭璇�
@@ -47,5 +49,21 @@
*/
private String status;
+ /**
+ * 鐘舵�佷笉涓哄緟涓嬪彂(宸ュ崟鍒楄〃澶嶇敤)
+ */
+ private Boolean isNotDistribute;
+
+ /**
+ * 杩愮淮澶勭悊鏃堕棿
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date start;
+
+ /**
+ * 杩愮淮澶勭悊鏃堕棿
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date end;
}
--
Gitblit v1.8.0