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/PrMonitoringFlowmeterMapper.xml | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrMonitoringFlowmeterMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrMonitoringFlowmeterMapper.xml
index 2c63ca8..916a032 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrMonitoringFlowmeterMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrMonitoringFlowmeterMapper.xml
@@ -149,11 +149,15 @@
</select>
<!--鏍规嵁 娴侀噺鐩戞祴绔欑紪鍙� 鑾峰彇 缁戝畾璁板綍 鎸夋搷浣滄椂闂撮檷搴�-->
- <select id="getBingRecordsByMonitoringId" parameterType="_long" resultType="java.util.Map">
- select (@i:=@i+1) AS id,
- <include refid="Base_Column_List_NoId" />
- from pr_monitoring_flowmeter
- ,(SELECT @i:=0) AS itable
+ <select id="getBingRecordsByMonitoringId" parameterType="string" resultType="java.util.Map">
+ select CAST(id AS char) as id,
+ CAST(monitoringId AS char)as monitoringId,
+ CAST(flowmeterId AS char)as flowmeterId,
+ operateType,
+ remarks,
+ `operator`,
+ operateDt
+ from pr_monitoring_flowmeter pmf
where
monitoringId=#{monitoringId,jdbcType=BIGINT}
order by operateDt desc
--
Gitblit v1.8.0