From 877a671ec240a67801c2840d3cdec961350bf5cf Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期二, 10 六月 2025 17:28:31 +0800
Subject: [PATCH] 电池告警参数查询

---
 src/main/resources/mapper/BattAlmparamMapper.xml |   30 +++++++++++++++++-------------
 1 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/mapper/BattAlmparamMapper.xml b/src/main/resources/mapper/BattAlmparamMapper.xml
index 2be7e7c..87b1535 100644
--- a/src/main/resources/mapper/BattAlmparamMapper.xml
+++ b/src/main/resources/mapper/BattAlmparamMapper.xml
@@ -3,28 +3,32 @@
 <mapper namespace="com.whyc.mapper.BattAlmparamMapper">
 
     <select id="getBattAlmParam" resultType="com.whyc.pojo.db_param.BattAlmparam">
-        select distinct tb_batt_inf.*
+        select distinct tb_batt_almparam.*,tb_batt_inf.battgroup_name
         ,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
+        from db_station.tb_batt_inf,db_station.tb_station_inf,db_param.tb_batt_almparam
         <where>
-            tb_batt_inf.station_id=tb_station_inf.station_id
-            <if test="stic.provice!=null">
-                and tb_station_inf.provice=#{stic.provice}
+            tb_batt_inf.battgroup_id=tb_batt_almparam.battgroup_id
+            and tb_batt_inf.station_id=tb_station_inf.station_id
+            <if test="almDto.provice!=null">
+                and tb_station_inf.provice=#{almDto.provice}
             </if>
-            <if test="stic.city!=null">
-                and tb_station_inf.city=#{stic.city}
+            <if test="almDto.city!=null">
+                and tb_station_inf.city=#{almDto.city}
             </if>
-            <if test="stic.country!=null">
-                and tb_station_inf.country=#{stic.country}
+            <if test="almDto.country!=null">
+                and tb_station_inf.country=#{almDto.country}
             </if>
-            <if test="stic.stationName!=null">
-                and tb_station_inf.station_name=#{stic.stationName}
+            <if test="almDto.stationName!=null">
+                and tb_station_inf.station_name=#{almDto.stationName}
             </if>
-            <if test="stic.uid>100">
+            <if test="almDto.battgroupName!=null">
+                and tb_batt_inf.battgroup_name=#{almDto.battgroupName}
+            </if>
+            <if test="almDto.uid>100">
                 and tb_batt_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=#{stic.uid}
+                and tb_baojigroup_usr.uid=#{almDto.uid}
                 )
             </if>
             order by tb_batt_inf.dev_id asc,battgroup_id asc

--
Gitblit v1.9.1