From 98cd37e22ae11376692241a62a8b5d932cbcd24e Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 19 十月 2018 13:25:16 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
index 2439cb5..0357c75 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
@@ -56,7 +56,7 @@
sql+=stationSql;
//瀹為檯缁埅鏃堕棿
String timelongSqlT=" and endurance_actual_timelong<=? ";//灏忎簬鏌愪竴鏃堕棿
- String timelongSqlF=" and endurance_actual_timelong!=? ";//鍏ㄩ儴
+ String timelongSqlF=" and endurance_actual_timelong>-1? ";//鍏ㄩ儴
if(bendurance.getEndurance_actual_timelong()==0){
sql+=timelongSqlF;
}else{
--
Gitblit v1.9.1