From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期四, 17 四月 2025 14:22:59 +0800 Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划,是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryConditionVo.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryConditionVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryConditionVo.java new file mode 100644 index 0000000..bfe0ad6 --- /dev/null +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryConditionVo.java @@ -0,0 +1,46 @@ +package com.dy.common.webUtil; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.*; + +@Data +@ToString +@NoArgsConstructor +@AllArgsConstructor +@Schema(name = "鏌ヨ鏉′欢鍩虹被") +public class QueryConditionVo { + /** + * 褰撳墠鏌ヨ椤� + */ + @Schema(description = "褰撳墠椤�", requiredMode = Schema.RequiredMode.REQUIRED) + public Integer pageCurr; + + /** + * 姣忛〉鏁版嵁鏉℃暟 + */ + @Schema(description = "姣忛〉璁板綍鏁�", requiredMode = Schema.RequiredMode.REQUIRED) + public Integer pageSize; + + /** + * 璁剧疆褰撳墠榛樿绗竴椤� + * @return + */ + public Integer getPageCurr() { + if (pageCurr == null){ + return 1; + } + return pageCurr; + } + + /** + * 璁剧疆褰撳墠榛樿涓�椤靛崄鏉� + * @return + */ + public Integer getPageSize() { + if (pageSize == null){ + return 10; + } + return pageSize; + } +} -- Gitblit v1.8.0