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

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StClientAmountDayMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StClientAmountDayMapper.xml
index a6fa3e8..456ce0b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StClientAmountDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StClientAmountDayMapper.xml
@@ -1206,7 +1206,7 @@
     select
     count(*)
     from se_client mtb
-    where mtb.deleted != 0
+    where mtb.deleted != 1
     <trim prefix="and" suffixOverrides="and">
       <if test="name != null and name != ''">
         mtb.name like concat('%', #{name}, '%')
@@ -1225,7 +1225,7 @@
     </include>
     from se_client mtb
     LEFT JOIN st_client_amount_day stTb on stTb.client_id = mtb.id
-    where mtb.deleted != 0
+    where mtb.deleted != 1
     <trim prefix="and" suffixOverrides="and">
       <if test = "year != null">
         stTb.year = #{year, jdbcType=INTEGER}

--
Gitblit v1.8.0