From 80448d25917654513e082ac02e8e6f84fcabb7c8 Mon Sep 17 00:00:00 2001
From: 星伟 <星伟@192.168.10.25>
Date: 星期四, 27 九月 2018 10:16:16 +0800
Subject: [PATCH] 修改回来signalname

---
 gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index 764a5cd..9a236dc 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -168,10 +168,10 @@
 				+ "FBSDeviceName,GroupIndexInFBSDevice,battgroupId,BattGroupNum,BattGroupName,FloatVolLevel,OfflineVolLevel,BattFloatCurrent" +
 				 ",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate " +
 				 " From db_battinf.tb_battinf " +
-				 " Where StationName like ? and StationName1 like ? " +
+				 " Where StationName like ? and StationName1 like ? and StationName2 like ?  " +
 				 " order by StationId  " +
 				 " limit ?,?";
-		List<BattInf> list=DAOHelper.executeQueryLimit(sql,conn, new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%",(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()},new CallBack() {
+		List<BattInf> list=DAOHelper.executeQueryLimit(sql,conn, new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%",(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()},new CallBack() {
 			
 			public List getResults(ResultSet rs) {
 				List list = new ArrayList<BattInf>();
@@ -3473,7 +3473,7 @@
 		
 		BattInfImpl biml = new BattInfImpl();
 		BattInf binf = new BattInf();
-		binf.setBattGroupId(0);
+		binf.setBattGroupId(1000967);
 		binf.setStationName("鍐呰挋鍙�");
 		binf.setStationName1("鍐呰挋鍙�");
 		
@@ -3500,7 +3500,8 @@
 		bmd.setUinf(uinf);
 		//List<BattInf> list = biml.serchByConditionNew(bmd);
 		//List<BattInf> list=biml.serchByTestType(bmd);
-		List<BattInf> list=biml.serchGroupAssess(bmd);
+		//List<BattInf> list=biml.serchGroupAssess(bmd);
+		List<BattInf> list=biml.serchByMonNum(binf);
 		for (BattInf b : list) {
 			System.out.println(b);
 		}

--
Gitblit v1.9.1