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-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/allRound/Ar4BaseSv.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/allRound/Ar4BaseSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/allRound/Ar4BaseSv.java
index b31dacf..f2ed335 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/allRound/Ar4BaseSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/allRound/Ar4BaseSv.java
@@ -1,7 +1,6 @@
package com.dy.pipIrrBase.allRound;
-import com.dy.common.webUtil.QueryResultVo;
-import com.dy.pipIrrGlobal.VoAllRound.VoArIntakeBase;
+import com.dy.pipIrrGlobal.voAllRound.VoArIntakeBase;
import com.dy.pipIrrGlobal.daoAllRound.Ar4BaseMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,12 +28,11 @@
* 鍙栨按鍙ｅ熀鏈俊鎭�
* @return 鍙栨按鍙ｅ熀鏈俊鎭�
*/
- public QueryResultVo<VoArIntakeBase> intakeInfo(Long intakeId){
- QueryResultVo<VoArIntakeBase> rsVo = new QueryResultVo<>() ;
+ public VoArIntakeBase intakeInfo(Long intakeId){
List<VoArIntakeBase> list = this.dao.intakeInfo(intakeId);
if(list != null && list.size() > 0){
- rsVo.obj = list.get(0) ;
+ return list.get(0) ;
}
- return rsVo ;
+ return null ;
}
}
--
Gitblit v1.8.0