From cd24a045bd9ee29505ddc9760d25f5d4037f4f0c Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期四, 05 九月 2024 21:55:28 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java | 41 +++++++++++++++++++++++++++++++++++++---- 1 files changed, 37 insertions(+), 4 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 13d3d68..1712e99 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,13 +1,14 @@ package com.ycl.platform.domain.query; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ycl.platform.base.AbsQuery; -import java.util.List; -import org.springframework.lang.NonNull; -import jakarta.validation.constraints.NotBlank; +import enumeration.general.WorkOrderStatusEnum; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; + +import java.util.Date; +import java.util.List; /** * 宸ュ崟鏌ヨ @@ -19,5 +20,37 @@ @Accessors(chain = true) @ApiModel(value = "WorkOrder鏌ヨ", description = "宸ュ崟鏌ヨ") public class WorkOrderQuery extends AbsQuery { + + /** + * 宸ュ崟鍙� + */ + private String workOrderNo; + + /** + * 杩愮淮澶勭悊鏃堕棿 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date start; + + /** + * 杩愮淮澶勭悊鏃堕棿 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date end; + + /** + * 鏁呴殰绫诲瀷 + */ + private List<String> errorTypeList; + + /** + * 鐘舵�� + */ + private String status; + + /** + * 鍗曚綅id + */ + private Integer unitId; } -- Gitblit v1.8.0