From f5d6d172759b5d91b86afe737a6d1f248bc4f39d Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.28>
Date: 星期一, 19 十一月 2018 09:30:01 +0800
Subject: [PATCH] 首页读基站信息

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

diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index af7ad73..dae6701 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -3979,9 +3979,9 @@
 	//棣栭〉涓婃牴鎹畇tationid鏌ヨ鐢垫睜缁勭殑鏈哄巻鍗�
 	public List serchBattAllInfoByStationId(Object obj){
 		BattInf binf=(BattInf) obj;
-		String sql="select * from db_battinf.tb_battinf,db_battinf.tb_battinf_ex " +
-				" where db_battinf.tb_battinf.stationId=db_battinf.tb_battinf_ex.stationid " +
-				" and db_battinf.tb_battinf.stationId=? " +
+		String sql="select * from db_battinf.tb_battinf " +
+				" left outer join  db_battinf.tb_battinf_ex on db_battinf.tb_battinf.stationId=db_battinf.tb_battinf_ex.stationid " +
+				" where db_battinf.tb_battinf.stationId=? " +
 				" order by db_battinf.tb_battinf.battgroupid";
 		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getStationId()}, new CallBack() {
 			
@@ -4165,7 +4165,7 @@
 		binf.setStationName3("");
 		binf.setBattGroupName("");
 		binf.setBattProducer("1");
-		binf.setStationId("42000002");
+		binf.setStationId("42000575");
 		User_inf uinf=new User_inf();
 		uinf.setUId(1002);
 		
@@ -4194,8 +4194,8 @@
 		//List<BattInf> list=biml.serchGroupByInfor(binf);
 		//List<BattInf> list=biml.searchInform1(bmd);
 		//<BattInf> list=biml.serchStationName5(binf);
-		//List<BattInf> list=biml.serchBattAllInfoByStationId(binf);
-		List<BattInf> list=biml.searchInform_ky();
+		List<BattInf> list=biml.serchBattAllInfoByStationId(binf);
+		//List<BattInf> list=biml.searchInform_ky();
 		for (BattInf b : list) {
 			System.out.println(b);
 		}

--
Gitblit v1.9.1