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

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml
index 4315729..3e7ca07 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml
@@ -212,7 +212,7 @@
   </update>
 
   <!--鏍规嵁涓婚敭鑾峰彇澶勭悊缁撴灉瑙嗗浘瀵硅薄-->
-  <select id="getProResultById" resultType="com.dy.pipIrrGlobal.voOp.VoProcessingResult">
+  <select id="getProResultById" resultType="com.dy.pipIrrGlobal.voOp.VoProcessingResult_temp">
     SELECT
         res.id AS proResultId,
         res.work_order_id AS workOrderId,
@@ -227,7 +227,7 @@
         res.report_time AS reportTime,
         res.state,
         CASE
-            WHEN res.state = 1 THEN '宸蹭笂鎶�'
+            WHEN res.state = 1 THEN '寰呭鏍�'
             WHEN res.state = 2 THEN '宸查�氳繃'
             WHEN res.state = 3 THEN '宸查┏鍥�'
         END AS stateName

--
Gitblit v1.8.0