From 1129cc278ec2f7f1fd3eb325b11974bd884346da Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期三, 09 四月 2025 13:48:49 +0800 Subject: [PATCH] 灌溉计划详情增加计划状态 --- pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/dto/AutomaticClose.java | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/dto/AutomaticClose.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/dto/AutomaticClose.java index 5989744..9ea6ecd 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/dto/AutomaticClose.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/dto/AutomaticClose.java @@ -1,7 +1,10 @@ package com.dy.pipIrrWechat.command.dto; -import jakarta.validation.constraints.NotBlank; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; /** * @author ZhuBaoMin @@ -10,26 +13,20 @@ * @Description */ @Data +@EqualsAndHashCode(callSuper=false) public class AutomaticClose extends DtoBase { public static final long serialVersionUID = 202407231056001L; /** - * 闃�鎺у櫒鍦板潃 + * 铏氭嫙鍗D */ - @NotBlank(message = "闃�鎺у櫒鍦板潃涓嶈兘涓虹┖") - private String rtuAddr; + private Long vcId; /** - * 铏氭嫙鍗$紪鍙� + * 璁″垝寮�闃�鏃堕棿 */ - @NotBlank(message = "铏氭嫙鍗$紪鍙蜂笉鑳戒负绌�") - private String vcNum; - - /** - * 璁㈠崟鍙� - */ - @NotBlank(message = "璁㈠崟鍙蜂笉鑳戒负绌�") - private String orderNo; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date plannedOpenTime; /** * 鐢ㄦ按鏃堕暱锛屾嫢鏈夊畾鏃跺叧闃� @@ -40,4 +37,9 @@ * 棰勭敤姘撮噺锛屾嫢鏈夊畾閲忓叧闃� */ private Integer waterAmount; + + /** + * 寮�闃�绫诲瀷锛�1-杞亴 + */ + private Byte openType; } -- Gitblit v1.8.0