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-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java
index 1a2d8af..28edc55 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java
@@ -38,11 +38,16 @@
@ColumnWidth(15)
private String divideName;
- @Schema(title = "鎵�灞炵墖鍖�")
- @ExcelProperty("鎵�灞炵墖鍖�")
- @ColumnWidth(15)
+ @Schema(title = "鎵�灞炵墖鍖篒D")
+ @ExcelProperty("鎵�灞炵墖鍖篒D")
+ @ColumnWidth(19)
private String blockId;
+ @Schema(title = "鎵�灞炵墖鍖哄悕绉�")
+ @ExcelProperty("鎵�灞炵墖鍖哄悕绉�")
+ @ColumnWidth(15)
+ private String blockName;
+
@Schema(title = "璐熻矗浜�")
@ExcelProperty("璐熻矗浜�")
@ColumnWidth(10)
--
Gitblit v1.8.0