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/java/com/dy/pipIrrGlobal/command/ComSupport.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
index d73733d..646d9be 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
@@ -369,7 +369,7 @@
rmCommandHistory.setResult((byte) 0);
rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
- if(openType == 1 ) {
+ if(openType != null && openType == 1 ) {
irIntakeOperateMapper.updateByCommandId(comId, (byte)2, "寮�闃�澶辫触");
}
@@ -401,7 +401,7 @@
rmCommandHistory.setResult((byte) 1);
rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
- if(openType == 1) {
+ if(openType != null && openType == 1) {
irIntakeOperateMapper.updateByCommandId(comId, (byte)1, null);
}
--
Gitblit v1.8.0