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/SpecialMapper.xml | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml index d3c3f3e..01a5a70 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml @@ -28,6 +28,7 @@ </trim> </select> + <select id="selectStealSome" parameterType="java.util.Map" resultType="com.dy.pipIrrGlobal.voSpecial.VoSteal"> select mTb.id as id, mTb.intake_id as intakeId, mTb.client_id as clientId, piTb.name as intakeNum, piTb.lng as intakeLng, piTb.lat as intakeLat, @@ -65,7 +66,6 @@ </select> - <select id="selectAbnormalCloseValveTotal" parameterType="java.util.Map" resultType="java.lang.Long"> select count(*) @@ -92,7 +92,8 @@ </trim> </select> - <select id="selectAbnormalCloseValveSome" parameterType="java.util.Map" resultType="com.dy.pipIrrGlobal.voSpecial.VoSteal"> + + <select id="selectAbnormalCloseValveSome" parameterType="java.util.Map" resultType="com.dy.pipIrrGlobal.voSpecial.VoAbnormalCloseValve"> select mTb.id as id, mTb.intake_id as intakeId, mTb.client_id as clientId, piTb.name as intakeNum, piTb.lng as intakeLng, piTb.lat as intakeLat, scTb.name as clientName, scTb.clientNum as clientNum, -- Gitblit v1.8.0