From ff1ed10ebcb27f4039fb121486261c0b24208baf Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期一, 22 七月 2024 10:43:25 +0800
Subject: [PATCH] 蓄电池单体容量

---
 src/main/resources/mapper/BattTestInfMapper.xml |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/BattTestInfMapper.xml b/src/main/resources/mapper/BattTestInfMapper.xml
index ab24377..c3faf9b 100644
--- a/src/main/resources/mapper/BattTestInfMapper.xml
+++ b/src/main/resources/mapper/BattTestInfMapper.xml
@@ -5,7 +5,7 @@
     <select id="searchDischargeTest" resultType="com.whyc.pojo.BattTestInf">
         select
         battgroupid,test_curr,max_monvol,min_monvol,test_cap,test_starttime,record_time,test_timelong,test_stoptype
-        from db_batt_testdata.tb_batttestdata_inf
+        from db_dis_batt.batt_test_inf
         <where>
             db_batt_testdata.tb_batttestdata_inf.data_available=1
             and test_starttype=3 and test_type=3
@@ -18,12 +18,12 @@
                 and record_time>=#{recordStartTime} and record_time&lt;=#{recordEndTime}
             </if>
         </where>
-        ORDER BY tb_batttestdata_inf.BattGroupId asc, test_starttime desc
+        ORDER BY db_dis_batt.batt_test_inf.BattGroupId asc, test_starttime desc
     </select>
     <select id="searchDischargeTest_WJ" resultType="com.whyc.pojo.BattTestInf">
         select
         battgroupid,test_curr,max_monvol,min_monvol,test_cap,test_starttime,record_time,test_timelong,test_stoptype
-        from db_batt_testdata.tb_batttestdata_inf
+        from db_dis_batt.batt_test_inf
         <where>
             db_batt_testdata.tb_batttestdata_inf.data_available=1
             and test_starttype=3 and test_type=3
@@ -36,6 +36,21 @@
                 and record_time&lt;#{recordStartTime}
             </if>
         </where>
-        ORDER BY tb_batttestdata_inf.BattGroupId asc, test_starttime desc
+        ORDER BY db_dis_batt.batt_test_inf.BattGroupId asc, test_starttime desc
+    </select>
+    <select id="searchDischarge" resultType="com.whyc.pojo.BattTestInf">
+        select
+        battgroupid,test_curr,max_monvol,min_monvol,test_cap,test_starttime,record_time,test_timelong,test_stoptype
+        from db_dis_batt.batt_test_inf
+        <where>
+            db_batt_testdata.tb_batttestdata_inf.data_available=1
+            and test_starttype=3 and test_type=3
+            and (test_stoptype in (3, 4, 6)
+            or (test_stoptype=2 and test_timelong>=7200))
+            <if test="battGroupId!=null">
+                and battgroupid=#{battGroupId}
+            </if>
+        </where>
+        ORDER BY db_dis_batt.batt_test_inf.BattGroupId asc, test_starttime desc
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1