From d384786ab5868cd4d856691372eee5359e7d9b2c Mon Sep 17 00:00:00 2001 From: zxl <763096477@qq.com> Date: 星期五, 28 三月 2025 17:48:47 +0800 Subject: [PATCH] 导出新增 连个列,以及同步数据库时点位名修改未成功问题 --- ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java | 31 +++++++++++++++++++++---------- 1 files changed, 21 insertions(+), 10 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 ff01f75..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,17 +1,15 @@ 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 java.time.LocalDateTime; -import java.util.Date; -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; /** * 宸ュ崟鏌ヨ @@ -27,24 +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 String status; + /** + * 鍗曚綅id + */ + private Integer unitId; } -- Gitblit v1.8.0