From 1129cc278ec2f7f1fd3eb325b11974bd884346da Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 09 四月 2025 13:48:49 +0800
Subject: [PATCH] 灌溉计划详情增加计划状态
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoPlanDetails.java | 7 ++++++-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml | 3 +++
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoPlanDetails.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoPlanDetails.java
index 8057a8d..c95c72b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoPlanDetails.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoPlanDetails.java
@@ -15,7 +15,7 @@
*/
@Data
-@JsonPropertyOrder({"planName", "projectName", "planStartTime", "planStopTime", "groups"})
+@JsonPropertyOrder({"planName", "projectName", "state", "planStartTime", "planStopTime", "groups"})
public class VoPlanDetails {
private static final long serialVersionUID = 202504091125001L;
@@ -30,6 +30,11 @@
private String projectName;
/**
+ * 鐏屾簤璁″垝鐘舵��
+ */
+ private Integer state;
+
+ /**
* 鐏屾簤璁″垝寮�濮嬫椂闂�
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
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 287b5aa..001c930 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml
@@ -342,6 +342,9 @@
SELECT
plan.plan_name AS planName,
pro.project_name AS projectName,
+ IF(plan.executing_state = 3, '5',
+ IF(NOW() < plan.plan_start_time,'2',
+ IF(NOW() < plan.plan_stop_time, '3', '4'))) AS state,
plan.plan_start_time AS planStartTime,
plan.plan_stop_time AS planStopTime,
NULL AS groupDetails
--
Gitblit v1.8.0