From 01a30369e55a754c28dec4939a99e59aefecdc60 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 08 八月 2024 20:48:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 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 7b8274d..dd863ca 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
@@ -1,9 +1,14 @@
package com.ycl.platform.domain.form;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.system.domain.group.Update;
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;
@@ -14,6 +19,8 @@
import lombok.experimental.Accessors;
import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
/**
* 杩愮淮鐐逛綅琛ㄥ崟
@@ -30,28 +37,36 @@
@ApiModelProperty("鐐逛綅鍚嶇О")
private String pointName;
- @NotNull(message = "鐐逛綅寮�濮嬫椂闂翠笉鑳戒负绌�", groups = {Add.class, Update.class})
- @ApiModelProperty("鐐逛綅寮�濮嬫椂闂�")
- private LocalDateTime startTime;
-
- @NotNull(message = "鐐逛綅缁撴潫鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鐐逛綅缁撴潫鏃堕棿")
- private LocalDateTime endTime;
-
@NotNull(message = "杩愮淮鍗曚綅涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("杩愮淮鍗曚綅")
private Integer unitId;
-// @NotBlank(message = "杩愮淮鐘舵�佷笉鑳戒负绌�", groups = {Add.class, Update.class})
+ @NotNull(message = "鐩戠閮ㄩ棬涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("鐩戠閮ㄩ棬")
+ private Long deptId;
+
+ @ApiModelProperty("鐪佸巺鐐逛綅鏍囩")
+ private ProvinceTagEnum provinceTag;
+ @ApiModelProperty("閲嶇偣鐐逛綅鏍囩")
+ private ImportantTagEnum importantTag;
@ApiModelProperty("杩愮淮鐘舵��")
private String status;
+ @ApiModelProperty("澶囨敞")
+ private String remark;
- private String pointDetail;
+ @ApiModelProperty("璁惧缂栧彿")
+ private String serialNumber;
-// @NotBlank(message = "澶囨敞涓嶈兘涓虹┖", groups = {Add.class, Update.class})
-// @ApiModelProperty("澶囨敞")
-// private String remark;
+ @TableField("reason")
+ private String reason;
+
+ @TableField("recovery")
+ private Integer recovery;
+
+ @TableField("recovery_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date recoveryTime;
public static YwPoint getEntityByForm(@NonNull YwPointForm form, YwPoint entity) {
if(entity == null) {
--
Gitblit v1.8.0