From a6018ae593fc2d2fb3ccfa4e7c34f28387326f6b Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 19 六月 2025 15:06:25 +0800
Subject: [PATCH] 3.1电池/电源告警参数,1.2.7优良电源统计

---
 src/main/resources/mapper/BattInfMapper.xml |   30 +++++++-----------------------
 1 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/src/main/resources/mapper/BattInfMapper.xml b/src/main/resources/mapper/BattInfMapper.xml
index b28e4a1..f9e749c 100644
--- a/src/main/resources/mapper/BattInfMapper.xml
+++ b/src/main/resources/mapper/BattInfMapper.xml
@@ -466,32 +466,16 @@
             </if>
         </where>
     </select>
-    <select id="getBattgroupIdList" resultType="java.lang.Integer">
-        select distinct battgroup_id from db_station.tb_batt_inf,db_station.tb_station_inf
+    <select id="getBattgroupIdList" resultType="com.whyc.pojo.db_station.BattInf">
+        select distinct tb_batt_inf.*
+        ,tb_station_inf.station_type,tb_station_inf.station_name,tb_station_inf.provice,tb_station_inf.city,tb_station_inf.country,tb_station_inf.full_name
+        from db_station.tb_batt_inf,db_station.tb_station_inf
         <where>
             tb_batt_inf.station_id=tb_station_inf.station_id
-            <if test="dto.provice!=null">
-                and tb_station_inf.provice=#{dto.provice}
-            </if>
-            <if test="dto.city!=null">
-                and tb_station_inf.city=#{dto.city}
-            </if>
-            <if test="dto.country!=null">
-                and tb_station_inf.country=#{dto.country}
-            </if>
-            <if test="dto.stationId!=null">
-                and tb_station_inf.station_id=#{dto.stationId}
-            </if>
-            <if test="dto.battgroupId!=null">
-                and battgroup_id.battgroup_id=#{dto.battgroupId}
-            </if>
-            <if test="dto.uid>100">
-                and tb_station_inf.station_id in(
-                select distinct station_id from db_user.tb_baojigroup_power,db_user.tb_baojigroup_usr
-                where   tb_baojigroup_power.baoji_group_id=tb_baojigroup_usr.baoji_group_id
-                and tb_baojigroup_usr.uid=#{dto.uid}
-                )
+            <if test="battgroupId!=null">
+                and tb_batt_inf.battgroup_id=#{battgroupId}
             </if>
         </where>
+        limit 1
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1