From b14531e3b850fe6d2fa916ba7b88b3e2bd2ff30a Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 11 九月 2024 16:47:48 +0800 Subject: [PATCH] OSD加标签 --- ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java | 43 ++++++++++++++++++++++++++++++++----------- 1 files changed, 32 insertions(+), 11 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 a053a68..37d256b 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,5 +1,7 @@ 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; @@ -13,7 +15,7 @@ import lombok.Data; import lombok.experimental.Accessors; -import java.time.LocalDateTime; +import java.util.Date; /** * 杩愮淮鐐逛綅琛ㄥ崟 @@ -30,26 +32,45 @@ @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 Boolean provinceTag; + + @ApiModelProperty("閲嶇偣鐐逛綅鏍囩") + private Boolean importantTag; + + @ApiModelProperty("閲嶇偣鎸囨尌鍥惧儚鏍囩") + private Boolean importantCommandImageTag; + + @ApiModelProperty("閮ㄧ骇鏍囩") + private Boolean deptTag; + @ApiModelProperty("杩愮淮鐘舵��") private String status; - @NotBlank(message = "澶囨敞涓嶈兘涓虹┖", groups = {Add.class, Update.class}) @ApiModelProperty("澶囨敞") private String remark; + @ApiModelProperty("璁惧缂栧彿") + private String serialNumber; + + @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) { entity = new YwPoint(); -- Gitblit v1.8.0