From 3e4465519fc0bebf411f1accb97a2d053273beac Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 26 九月 2018 14:46:15 +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 | 6 +++---
1 files changed, 3 insertions(+), 3 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 490600b..6fc39ff 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
@@ -46,7 +46,7 @@
" from web_site.tb_batt_endurance,db_battinf.tb_battinf " +
" where tb_batt_endurance.stationid=db_battinf.tb_battinf.stationid " ;
//鏈烘埧绛涢��
- String stationSql=" and tb_batt_endurance.stationid like ?";
+ String stationSql=" and db_battinf.tb_battinf.StationName like ?";
sql+=stationSql;
//缁埅鐘舵��
String enduranceSqlT=" and endurance_state=? ";
@@ -67,7 +67,7 @@
//鎺掑簭鏃堕棿
String orderSql=" order by endurance_timelong asc";
//System.out.println(sql);
- List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+bendurance.getStationid()+"%",bendurance.getEndurance_state(),bendurance.getEndurance_timelong()}, new CallBack() {
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+bendurance.getNote()+"%",bendurance.getEndurance_state(),bendurance.getEndurance_timelong()}, new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
@@ -102,7 +102,7 @@
public static void main(String[] args) {
Batt_enduranceImpl bimpl=new Batt_enduranceImpl();
Batt_endurance ben=new Batt_endurance();
- ben.setStationid("");
+ ben.setNote("");
ben.setEndurance_state(0);
ben.setEndurance_timelong(0);
List list=bimpl.serchByCondition(ben);
--
Gitblit v1.9.1