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

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StLossYearMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StLossYearMapper.xml
index 7c151c5..f0ae670 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StLossYearMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StLossYearMapper.xml
@@ -21,7 +21,7 @@
     where id = #{id,jdbcType=BIGINT}
   </select>
 
-  <select id="selectByIntakeIdAndYear" resultMap="BaseResultMap">
+  <select id="selectByIntakeIdAndYear" resultType="com.dy.pipIrrGlobal.pojoSt.StLossYear">
     <!--@mbg.generated-->
     select
     <include refid="Base_Column_List" />

--
Gitblit v1.8.0