From f09c0c68d2ccaa3f79d80c163f2bb5d807eda85e Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 20 六月 2025 14:29:39 +0800
Subject: [PATCH] 一次完整周期的核容测试和未满足标准核容
---
src/main/java/com/whyc/service/BatttestdataInfService.java | 8 +++++---
src/main/resources/mapper/BatttestdataInfMapper.xml | 5 +++--
src/main/java/com/whyc/pojo/db_batt_testdata/BatttestdataInf.java | 2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/pojo/db_batt_testdata/BatttestdataInf.java b/src/main/java/com/whyc/pojo/db_batt_testdata/BatttestdataInf.java
index a145a63..1a27f8c 100644
--- a/src/main/java/com/whyc/pojo/db_batt_testdata/BatttestdataInf.java
+++ b/src/main/java/com/whyc/pojo/db_batt_testdata/BatttestdataInf.java
@@ -55,7 +55,7 @@
@ApiModelProperty(value = "鏄惁鏄渶鏂版暟鎹�")
private Integer dataNew;
- @ApiModelProperty(value = "鏄惁鏈夋晥")
+ @ApiModelProperty(value = "鏄惁涓轰竴娆℃湁鏁堢殑璁板綍1:鏈夋晥")
private Integer dataAvailable;
@ApiModelProperty(value = "璁板綍绗旀暟")
diff --git a/src/main/java/com/whyc/service/BatttestdataInfService.java b/src/main/java/com/whyc/service/BatttestdataInfService.java
index 1a81da5..5ebae1c 100644
--- a/src/main/java/com/whyc/service/BatttestdataInfService.java
+++ b/src/main/java/com/whyc/service/BatttestdataInfService.java
@@ -113,7 +113,8 @@
wrapper.eq("battgroup_id", battgroupId);
wrapper.eq("test_type", 3);
wrapper.eq("test_starttype", 3);
- wrapper.last(" and test_timelong >= 7200 ORDER BY test_starttime DESC ");
+ wrapper.eq("data_available", 1);//涓�娆℃湁鏁堢殑璁板綍
+ wrapper.last(" ORDER BY test_starttime DESC ");
wrapper.last("limit 1");
BatttestdataInf tinf = mapper.selectOne(wrapper);
tinf.setTestStoptypeReason(StopReasonEnum.getValue(tinf.getTestStoptype()));
@@ -132,8 +133,9 @@
if(testEndTime!=null){
wrapper.lt("test_starttime",testEndTime);
}
- wrapper.last(" and test_timelong >= 7200 ORDER BY test_starttime DESC ");
- wrapper.last("limit 1");
+ wrapper.eq("data_available", 1);//涓�娆℃湁鏁堢殑璁板綍
+ wrapper.last(" ORDER BY test_starttime DESC ");
+ wrapper.last(" limit 1 ");
BatttestdataInf tinf = mapper.selectOne(wrapper);
return tinf;
}
diff --git a/src/main/resources/mapper/BatttestdataInfMapper.xml b/src/main/resources/mapper/BatttestdataInfMapper.xml
index 08b829c..56b6323 100644
--- a/src/main/resources/mapper/BatttestdataInfMapper.xml
+++ b/src/main/resources/mapper/BatttestdataInfMapper.xml
@@ -44,8 +44,9 @@
<select id="getNoDischargeData" resultType="com.whyc.pojo.db_batt_testdata.BatttestdataInf">
select * from db_batt_testdata.tb_batttestdata_inf
<where>
- battgroup_id=#{battgroupId} and test_type=3
- and (test_starttype!=3 or test_timelong <7200)
+ battgroup_id=#{battgroupId}
+ and test_type=3
+ and data_available!=1
<if test="testStartTime!=null">
and tb_batttestdata_inf.test_starttime>=#{stic.testStartTime}
</if>
--
Gitblit v1.9.1