From b6184e2ddf3db37a94f7efb3b619bbc64642a292 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期二, 27 一月 2026 18:12:48 +0800
Subject: [PATCH] Z四

---
 service-fee/src/main/java/com/java110/fee/smo/impl/MeterWaterInnerServiceSMOImpl.java |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/service-fee/src/main/java/com/java110/fee/smo/impl/MeterWaterInnerServiceSMOImpl.java b/service-fee/src/main/java/com/java110/fee/smo/impl/MeterWaterInnerServiceSMOImpl.java
index 3460dd3..03b58ab 100755
--- a/service-fee/src/main/java/com/java110/fee/smo/impl/MeterWaterInnerServiceSMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/smo/impl/MeterWaterInnerServiceSMOImpl.java
@@ -63,6 +63,25 @@
         return meterWaters;
     }
 
+
+    @Override
+    public List<MeterWaterPo> queryMeterWaters(@RequestBody MeterWaterPo meterWaterDto) {
+        List<MeterWaterPo> meterWaters = BeanConvertUtil.covertBeanList(meterWaterServiceDaoImpl.getMeterWaterInfo(BeanConvertUtil.beanCovertMap(meterWaterDto)), MeterWaterPo.class);
+
+        if (meterWaters == null || meterWaters.size() == 0) {
+            return meterWaters;
+        }
+
+        String[] userIds = getUserIdsToPo(meterWaters);
+        //鏍规嵁 userId 鏌ヨ鐢ㄦ埛淇℃伅
+        List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(userIds);
+
+        for (MeterWaterPo meterWater : meterWaters) {
+            refreshMeterWater(meterWater, users);
+        }
+        return meterWaters;
+    }
+
     /**
      * 浠庣敤鎴峰垪琛ㄤ腑鏌ヨ鐢ㄦ埛锛屽皢鐢ㄦ埛涓殑淇℃伅 鍒锋柊鍒� floor瀵硅薄涓�
      *
@@ -70,6 +89,13 @@
      * @param users      鐢ㄦ埛鍒楄〃
      */
     private void refreshMeterWater(MeterWaterDto meterWater, List<UserDto> users) {
+        for (UserDto user : users) {
+            if (meterWater.getWaterId().equals(user.getUserId())) {
+                BeanConvertUtil.covertBean(user, meterWater);
+            }
+        }
+    }
+    private void refreshMeterWater(MeterWaterPo meterWater, List<UserDto> users) {
         for (UserDto user : users) {
             if (meterWater.getWaterId().equals(user.getUserId())) {
                 BeanConvertUtil.covertBean(user, meterWater);
@@ -91,6 +117,14 @@
 
         return userIds.toArray(new String[userIds.size()]);
     }
+    private String[] getUserIdsToPo(List<MeterWaterPo> meterWaters) {
+        List<String> userIds = new ArrayList<String>();
+        for (MeterWaterPo meterWater : meterWaters) {
+            userIds.add(meterWater.getWaterId());
+        }
+
+        return userIds.toArray(new String[userIds.size()]);
+    }
 
     @Override
     public int queryMeterWatersCount(@RequestBody MeterWaterDto meterWaterDto) {

--
Gitblit v1.8.0