From aec4636e4fb430055feb66751da0e6c05bb864df Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 30 四月 2025 16:25:30 +0800
Subject: [PATCH] fix(irrigatePlan): 修复终止灌溉计划时长设置错误- 将终止计划的默认时长从 9999 修改为 0 - 此修改确保在终止灌溉计划时，不会出现时长设置过长的问题
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
index a57afa2..10f472c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
@@ -275,10 +275,10 @@
from rm_loss_day
<where>
<if test="startDt != null ">
- AND dt <![CDATA[>=]]> #{startDt, jdbcType=DATE, jdbcType=DATE}
+ AND dt <![CDATA[>=]]> #{startDt, javaType=DATE, jdbcType=DATE}
</if>
<if test="endDt != null ">
- AND dt <![CDATA[<]]> #{endDt, jdbcType=DATE, jdbcType=DATE}
+ AND dt <![CDATA[<]]> #{endDt, javaType=DATE, jdbcType=DATE}
</if>
</where>
order by intake_id DESC, id ASC
@@ -287,7 +287,6 @@
<sql id="selectLossAmountOfDay_with">
- WITH intakeLossAmountDay AS (
SELECT intaId.intakeId AS intakeId,
rld.dt AS dt,
rld.loss_amount AS lossAmount
@@ -300,18 +299,17 @@
INNER JOIN rm_loss_day rld ON rld.intake_id = intaId.intakeId
<where>
<if test="startDt != null ">
- AND rld.dt <![CDATA[>=]]> #{startDt, jdbcType=DATE, jdbcType=DATE}
+ AND rld.dt <![CDATA[>=]]> #{startDt, javaType=DATE, jdbcType=DATE}
</if>
<if test="endDt != null ">
- AND rld.dt <![CDATA[<=]]> #{endDt, jdbcType=DATE, jdbcType=DATE}
+ AND rld.dt <![CDATA[<=]]> #{endDt, javaType=DATE, jdbcType=DATE}
</if>
</where>
- )
</sql>
<!--缁熻鎸囧畾鏈堜唤鍚勫ぉ婕忔崯閲�(1鍙峰埌5鍙�)-->
<select id="selectLossAmountOfDay01_05" resultType="com.dy.pipIrrGlobal.voSt.VoDayLoss">
- <include refid="selectLossAmountOfDay_with" />
+ WITH intakeLossAmountDay AS (<include refid="selectLossAmountOfDay_with"/>)
SELECT inta.intakeId AS intakeId,
inta.intakeNum AS intakeNum,
inta.intakeLng AS intakeLng,
@@ -375,7 +373,7 @@
<!--缁熻鎸囧畾鏈堜唤鍚勫ぉ婕忔崯閲�(6鍙峰埌10鍙�)-->
<select id="selectLossAmountOfDay06_10" resultType="com.dy.pipIrrGlobal.voSt.VoDayLoss">
- <include refid="selectLossAmountOfDay_with" />
+ WITH intakeLossAmountDay AS (<include refid="selectLossAmountOfDay_with"/>)
SELECT inta.intakeId AS intakeId,
inta.intakeNum AS intakeNum,
inta.intakeLng AS intakeLng,
@@ -438,7 +436,7 @@
<!--缁熻鎸囧畾鏈堜唤鍚勫ぉ婕忔崯閲�(11鍙峰埌15鍙�)-->
<select id="selectLossAmountOfDay11_15" resultType="com.dy.pipIrrGlobal.voSt.VoDayLoss">
- <include refid="selectLossAmountOfDay_with" />
+ WITH intakeLossAmountDay AS (<include refid="selectLossAmountOfDay_with"/>)
SELECT inta.intakeId AS intakeId,
inta.intakeNum AS intakeNum,
inta.intakeLng AS intakeLng,
@@ -501,7 +499,7 @@
<!--缁熻鎸囧畾鏈堜唤鍚勫ぉ婕忔崯閲�(20鍙峰埌16鍙�)-->
<select id="selectLossAmountOfDay16_20" resultType="com.dy.pipIrrGlobal.voSt.VoDayLoss">
- <include refid="selectLossAmountOfDay_with" />
+ WITH intakeLossAmountDay AS (<include refid="selectLossAmountOfDay_with"/>)
SELECT inta.intakeId AS intakeId,
inta.intakeNum AS intakeNum,
inta.intakeLng AS intakeLng,
@@ -564,7 +562,7 @@
<!--缁熻鎸囧畾鏈堜唤鍚勫ぉ婕忔崯閲�(21鍙峰埌25鍙�)-->
<select id="selectLossAmountOfDay21_25" resultType="com.dy.pipIrrGlobal.voSt.VoDayLoss">
- <include refid="selectLossAmountOfDay_with" />
+ WITH intakeLossAmountDay AS (<include refid="selectLossAmountOfDay_with"/>)
SELECT inta.intakeId AS intakeId,
inta.intakeNum AS intakeNum,
inta.intakeLng AS intakeLng,
@@ -627,7 +625,7 @@
<!--缁熻鎸囧畾鏈堜唤鍚勫ぉ婕忔崯閲�(26鍙峰埌31鍙�)-->
<select id="selectLossAmountOfDay26_31" resultType="com.dy.pipIrrGlobal.voSt.VoDayLoss">
- <include refid="selectLossAmountOfDay_with" />
+ WITH intakeLossAmountDay AS (<include refid="selectLossAmountOfDay_with"/>)
SELECT inta.intakeId AS intakeId,
inta.intakeNum AS intakeNum,
inta.intakeLng AS intakeLng,
--
Gitblit v1.8.0