From 845848661108dbce3759753a6005fb55f68dd188 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 05 二月 2025 14:49:53 +0800
Subject: [PATCH] 取水口综合信息中基本信息查询返回结果数据结构变更

---
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/allRound/Ar4BaseCtrl.java |    4 ++--
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/allRound/Ar4BaseSv.java   |    7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/allRound/Ar4BaseCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/allRound/Ar4BaseCtrl.java
index f9f8936..a0ff82f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/allRound/Ar4BaseCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/allRound/Ar4BaseCtrl.java
@@ -54,11 +54,11 @@
     })
     @GetMapping(path = "intakeInfo")
     @SsoAop()
-    public BaseResponse<QueryResultVo<VoArIntakeBase>> intakeInfo(Long intakeId) {
+    public BaseResponse<VoArIntakeBase> intakeInfo(Long intakeId) {
         if (intakeId == null || intakeId.longValue() == 0L) {
             return BaseResponseUtils.buildException("鍙栨按鍙d涓嶈兘涓虹┖");
         }
-        QueryResultVo<VoArIntakeBase> res = this.sv.intakeInfo(intakeId);
+        VoArIntakeBase res = this.sv.intakeInfo(intakeId);
         return BaseResponseUtils.buildSuccess(res);
     }
 }
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..c0b5de1 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
@@ -29,12 +29,11 @@
      * 鍙栨按鍙e熀鏈俊鎭�
      * @return 鍙栨按鍙e熀鏈俊鎭�
      */
-    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