From d8475b8670b6b4cbcd1bc9e57d30a6f433d206ab Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期一, 23 六月 2025 23:33:54 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem
---
src/main/resources/mapper/BattInfMapper.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/BattInfMapper.xml b/src/main/resources/mapper/BattInfMapper.xml
index 3ddd7c3..71b8776 100644
--- a/src/main/resources/mapper/BattInfMapper.xml
+++ b/src/main/resources/mapper/BattInfMapper.xml
@@ -231,6 +231,12 @@
<if test="stic.product!=null">
and tb_batt_inf.product=#{stic.product}
</if>
+ <if test="stic.inuseStartTime!=null">
+ and tb_batt_inf.inuse_time>=#{stic.inuseStartTime}
+ </if>
+ <if test="stic.inuseEndTime!=null">
+ and tb_batt_inf.inuse_time<=#{stic.inuseEndTimee}
+ </if>
<if test="stic.uid>100">
and tb_batt_inf.station_id in(
select distinct station_id from db_user.tb_baojigroup_power,db_user.tb_baojigroup_usr
--
Gitblit v1.9.1