From 1a2b07f01ba4616fd9e894dddf474b56d020158c Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 07 四月 2025 15:18:51 +0800
Subject: [PATCH] 整理版本

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 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 c8e5bc5..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
@@ -68,9 +68,9 @@
     private RmTimingReportLastMapper rmTimingReportLastDao; // 瀹氱偣涓婃姤鏈�鏂版暟鎹瓺AO
 
     @Autowired
-    private RmOnHourReportHistoryMapper rmOnHourReportHistoryDao; // 鏁寸偣涓婃姤鍘嗗彶鏁版嵁DAO
+    private RmOnHourReportHistoryMapper rmOnHourReportHistoryDao; // 瀹氱偣涓婃姤鍘嗗彶鏁版嵁DAO
     @Autowired
-    private RmOnHourReportLastMapper rmOnHourReportLastDao; // 鏁寸偣涓婃姤鏈�鏂版暟鎹瓺AO
+    private RmOnHourReportLastMapper rmOnHourReportLastDao; // 瀹氱偣涓婃姤鏈�鏂版暟鎹瓺AO
 
 
     //@Autowired
@@ -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 ;
@@ -214,8 +216,8 @@
      * @param intakeId
      */
     @Transactional(rollbackFor = Exception.class)
-    public void updateVirCardNoUseState(Long intakeId){
-        this.seVirtualCardDao.updateVcCardNoUseStateByIntakeId(intakeId); ;
+    public void updateVirCardNoUseState(Long intakeId, Date now){
+        this.seVirtualCardDao.updateVcCardNoUseStateByIntakeId(intakeId, now) ;
     }
 
 
@@ -268,12 +270,12 @@
 
     /////////////////////////////////////////////////
     //
-    // 鏁寸偣涓婃姤瀹炴椂鏁版嵁鍔熻兘(鍙湪闈虫�荤殑鍗忚鏈夋鏁版嵁)
+    // 瀹氱偣涓婃姤瀹炴椂鏁版嵁鍔熻兘(鍙湪闈虫�荤殑鍗忚鏈夋鏁版嵁)
     //
     ////////////////////////////////////////////////
 
     /**
-     * 淇濆瓨鎺у埗鍣ㄦ暣鐐逛笂鎶ュ巻鍙叉暟鎹�
+     * 淇濆瓨鎺у埗鍣ㄥ畾鐐逛笂鎶ュ巻鍙叉暟鎹�
      * @param po
      */
     @Transactional(rollbackFor = Exception.class)
@@ -282,7 +284,7 @@
     }
 
     /**
-     * 鏍规嵁闃�鎺у櫒鍦板潃鑾峰彇鏁寸偣涓婃姤鏈�鏂版暟鎹�
+     * 鏍规嵁闃�鎺у櫒鍦板潃鑾峰彇瀹氱偣涓婃姤鏈�鏂版暟鎹�
      * @param intakeId
      * @return
      */
@@ -296,7 +298,7 @@
     }
 
     /**
-     * 淇濆瓨鎺у埗鍣ㄦ暣鐐逛笂鎶ユ渶鏂版暟鎹�
+     * 淇濆瓨鎺у埗鍣ㄥ畾鐐逛笂鎶ユ渶鏂版暟鎹�
      * @param po
      */
     @Transactional(rollbackFor = Exception.class)
@@ -305,7 +307,7 @@
     }
 
     /**
-     * 淇濆瓨鎺у埗鍣ㄦ暣鐐逛笂鎶ョ姜琛屾暟鎹�
+     * 淇濆瓨鎺у埗鍣ㄥ畾鐐逛笂鎶ョ姜琛屾暟鎹�
      * @param po
      */
     @Transactional(rollbackFor = Exception.class)

--
Gitblit v1.8.0