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-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java
index 0ec82ac..b2a6a43 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java
@@ -98,6 +98,7 @@
                 vo = new SeClient() ;
                 vo.setId(Long.parseLong(map.get("clientId").toString()));
                 vo.setName(map.get("clientName").toString());
+                vo.setAddress(map.get("clientAddress").toString());
             }
         }
         return vo ;
@@ -116,6 +117,7 @@
                 vo = new SeClient() ;
                 vo.setId(Long.parseLong(map.get("clientId").toString()));
                 vo.setName(map.get("clientName").toString());
+                vo.setAddress(map.get("clientAddress").toString());
             }
         }
         return vo ;
@@ -215,7 +217,7 @@
      */
     @Transactional(rollbackFor = Exception.class)
     public void updateVirCardNoUseState(Long intakeId, Date now){
-        this.seVirtualCardDao.updateVcCardNoUseStateByIntakeId(intakeId); ;
+        this.seVirtualCardDao.updateVcCardNoUseStateByIntakeId(intakeId, now) ;
     }
 
 

--
Gitblit v1.8.0