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/BaDivideMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml
index b0c2a9c..472ac7f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml
@@ -52,13 +52,13 @@
left join ba_block bbk on bd.blockId = bbk.id
where bd.deleted != 1
<trim prefix="and" suffixOverrides="and">
- <if test="name != null">
+ <if test="name != null and name != ''">
bd.name like concat('%', #{name}, '%') and
</if>
- <if test="header != null">
+ <if test="header != null and header != ''">
bd.header = '#{header,jdbcType=VARCHAR}' and
</if>
- <if test="phone != null">
+ <if test="phone != null and phone != ''">
bd.phone = '#{phone,jdbcType=VARCHAR}' and
</if>
<if test="blockName != null">
@@ -81,13 +81,13 @@
left join ba_district bdtv on bd.villageId=bdtv.id
where bd.deleted != 1
<trim prefix="and" suffixOverrides="and">
- <if test="name != null">
+ <if test="name != null and name != ''">
bd.name like concat('%', #{name}, '%') and
</if>
- <if test="header != null">
+ <if test="header != null and header != ''">
bd.header = '#{header,jdbcType=VARCHAR}' and
</if>
- <if test="phone != null">
+ <if test="phone != null and phone != ''">
bd.phone = '#{phone,jdbcType=VARCHAR}' and
</if>
<if test="blockName != null">
--
Gitblit v1.8.0