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/resources/mapper/IrCropMapper.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrCropMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrCropMapper.xml
index fb1c0b8..da5e8f4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrCropMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrCropMapper.xml
@@ -84,7 +84,8 @@
     <select id="getCrops" resultType="com.dy.pipIrrGlobal.voIr.VoCrop">
         SELECT
         CAST(cro.id AS char)AS id,
-        cro.crop_name  AS  cropName
+        cro.crop_name  AS  cropName,
+        cro.remarks
         FROM ir_crop cro
         <where>
             cro.deleted = 0

--
Gitblit v1.8.0