From 3c02cf8bdc8181a1f8fc09bdd2608c7b004f942d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 20 十一月 2024 11:52:19 +0800
Subject: [PATCH] 避免下发页面的新增导致的重复工单
---
ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java
index dd863ca..adb6bfc 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java
@@ -6,9 +6,6 @@
import com.ycl.system.domain.group.Add;
import com.ycl.platform.base.AbsForm;
import com.ycl.platform.domain.entity.YwPoint;
-import enumeration.general.ImportantTagEnum;
-import enumeration.general.ProvinceTagEnum;
-import jakarta.validation.constraints.NotEmpty;
import org.springframework.beans.BeanUtils;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
@@ -18,9 +15,7 @@
import lombok.Data;
import lombok.experimental.Accessors;
-import java.time.LocalDateTime;
import java.util.Date;
-import java.util.List;
/**
* 杩愮淮鐐逛綅琛ㄥ崟
@@ -37,7 +32,6 @@
@ApiModelProperty("鐐逛綅鍚嶇О")
private String pointName;
- @NotNull(message = "杩愮淮鍗曚綅涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("杩愮淮鍗曚綅")
private Integer unitId;
@@ -46,9 +40,17 @@
private Long deptId;
@ApiModelProperty("鐪佸巺鐐逛綅鏍囩")
- private ProvinceTagEnum provinceTag;
+ private Boolean provinceTag;
+
@ApiModelProperty("閲嶇偣鐐逛綅鏍囩")
- private ImportantTagEnum importantTag;
+ private Boolean importantTag;
+
+ @ApiModelProperty("閲嶇偣鎸囨尌鍥惧儚鏍囩")
+ private Boolean importantCommandImageTag;
+
+ @ApiModelProperty("閮ㄧ骇鏍囩")
+ private Boolean deptTag;
+
@ApiModelProperty("杩愮淮鐘舵��")
private String status;
@@ -68,6 +70,15 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date recoveryTime;
+ @ApiModelProperty("鐐逛綅寮�濮嬫椂闂�")
+ @TableField("start_time")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date startTime;
+
+ @ApiModelProperty("鐐逛綅缁撴潫鏃堕棿")
+ @TableField("end_time")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date endTime;
public static YwPoint getEntityByForm(@NonNull YwPointForm form, YwPoint entity) {
if(entity == null) {
entity = new YwPoint();
--
Gitblit v1.8.0