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/PowerInfMapper.xml | 43 +++++++++++++++----------------------------
1 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/src/main/resources/mapper/PowerInfMapper.xml b/src/main/resources/mapper/PowerInfMapper.xml
index 7cb7ad3..1937714 100644
--- a/src/main/resources/mapper/PowerInfMapper.xml
+++ b/src/main/resources/mapper/PowerInfMapper.xml
@@ -145,11 +145,14 @@
<if test="stic.company!=null">
and tb_power_inf.company=#{stic.company}
</if>
- <if test="stic.inuseStartTime!=null">
- and tb_power_inf.power_inuse_time>=#{stic.inuseStartTime}
- </if>
- <if test="stic.inuseEndTime!=null">
- and tb_power_inf.power_inuse_time<=#{stic.inuseEndTimee}
+
+ <if test="stic.inuseYear!=null">
+ <if test="stic.inuseYear==1">
+ and tb_power_inf.power_inuse_time<=#{stic.pwrInUseTime}
+ </if>
+ <if test="stic.inuseYear!=1">
+ and tb_power_inf.power_inuse_time>=#{stic.pwrInUseTime}
+ </if>
</if>
<if test="stic.uid>100">
and tb_power_inf.power_id in(
@@ -169,33 +172,17 @@
and bu.uid = #{userId}
)
</select>
- <select id="getPowerIdList" resultType="java.lang.Integer">
- select distinct power_id from db_station.tb_power_inf,db_station.tb_station_inf
+ <select id="getPowerIdList" resultType="com.whyc.pojo.db_station.PowerInf">
+ select distinct tb_power_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_power_inf,db_station.tb_station_inf
<where>
tb_power_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.powerId!=null">
- and tb_power_inf.power_id=#{dto.powerId}
- </if>
- <if test="dto.uid>100">
- and tb_power_inf.power_id in(
- select distinct power_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="powerId!=null">
+ and tb_power_inf.power_id=#{powerId}
</if>
</where>
+ limit 1
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1