From eb5a6e5a54efa997971beffc909bcadc06dc8886 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 21 四月 2025 10:45:16 +0800
Subject: [PATCH] 1、江海测试系统设备类型默认为阀； 2、完善通信中间件测试消息推送代码； 3、增加队列数据结构注释； 4、121服务器相关的初始化配置文件bug修改； 5、其他注释完善。

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml
index 7397c62..e0c32f9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml
@@ -375,8 +375,13 @@
     SELECT
         plan.plan_name AS planName,
         pro.project_name AS projectName,
-        IF(#{terminateTime} &lt; plan.plan_start_time, 6,
-          IF(#{terminateTime} &lt; plan.plan_stop_time, 5, 4)) AS state,
+<!--        IF(#{terminateTime} &lt; plan.plan_start_time, 6,-->
+<!--          IF(#{terminateTime} &lt; plan.plan_stop_time, 5, 4)) AS state,-->
+        IF(plan.executing_state = 3, 5,
+            IF(NOW() &lt; plan_start_time, 2,
+                IF(NOW() &lt; plan_stop_time, 3, 4)
+            )
+        ) AS state,
         plan.plan_start_time AS planStartTime,
         plan.plan_stop_time AS planStopTime,
         #{terminateTime} AS realStopTime,
@@ -439,7 +444,7 @@
         IF(plan_state = 1, 1,
             IF(executing_state = 3, 5,
                 IF(NOW() &lt; plan_start_time, 2,
-                  IF(NOW() > plan_stop_time, 3, 4)
+                  IF(NOW() &lt; plan_stop_time, 3, 4)
                 )
             )
     ) AS planState

--
Gitblit v1.8.0