From c2976b80e8850be2d28dc2132c6659856b871f3c Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 08 五月 2025 21:10:42 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/dto/IrrigatePlan.java | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/dto/IrrigatePlan.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/dto/IrrigatePlan.java
index 55c7d07..c7fa0f7 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/dto/IrrigatePlan.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/dto/IrrigatePlan.java
@@ -1,8 +1,6 @@
package com.dy.pipIrrWechat.irrigatePlan.dto;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.*;
import lombok.Data;
import java.util.Date;
@@ -34,6 +32,8 @@
* 璁″垝鍚姩妯″紡锛�1-鎵嬪伐鍚姩锛�2-鑷姩鍚姩
*/
@NotNull(message = "璁″垝鍚姩妯″紡涓嶈兘涓虹┖")
+ @Min(value = 1, message = "璁″垝鍚姩妯″紡涓嶈兘灏忎簬1")
+ @Max(value = 2, message = "璁″垝鍚姩妯″紡涓嶈兘澶т簬2")
private Byte startupMode;
/**
@@ -42,19 +42,15 @@
private Date planStartTime;
/**
- * 璁″垝鍋滄鏃堕棿
+ * 鎿嶄綔浜篒D
*/
- private Date planStopTime;
-
- /**
- * 鐏屾簤绫诲瀷锛�1-杞亴缁勶紝2-鐏屾簤鍗曞厓
- */
- @NotNull(message = "鐏屾簤绫诲瀷涓嶈兘涓虹┖")
- private Byte irrigateType;
+ @NotNull(message = "鎿嶄綔浜篒D涓嶈兘涓虹┖")
+ private Long operatorId;
/**
* 鐏屾簤娆″簭
*/
- @NotEmpty(message = "宸℃杞ㄨ抗涓嶈兘涓虹┖")
+ @NotEmpty(message = "鐏屾簤娆″簭涓嶈兘涓虹┖")
private List<IrrigateSchedule> schedules;
+
}
--
Gitblit v1.8.0