From 4a55a64167f79e0146c78d78127fcbbe3b6e2113 Mon Sep 17 00:00:00 2001
From: 星伟 <星伟@192.168.10.24>
Date: 星期五, 28 九月 2018 11:24:50 +0800
Subject: [PATCH] 包机组修改添加市级筛选

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

diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index 5512cfa..c1666c3 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -354,6 +354,14 @@
 		}else{
 			baseSql+=station1SqlF;
 		}
+		//鐢ㄤ簬缁存姢鍖�
+		String station2SqlT=" stationname2!=? ";//鍏ㄩ儴
+		String station2SqlF=" stationname2=? ";
+		if(binf.getStationName2().equals("")){
+			baseSql+=station2SqlT;
+		}else{
+			baseSql+=station2SqlF;
+		}
 		//鐢ㄤ簬鏈烘埧绔欑偣
 		String stationSqlT=" and stationname!=? ";//鍏ㄩ儴
 		String stationSqlF=" and stationname=? ";
@@ -373,7 +381,7 @@
 		String endSql=" order by stationid ";
 		sql=baseSql+endSql;
 		//System.out.println(sql);
-		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getStationName1(),binf.getStationName(),binf.getBattGroupId()}, new CallBack() {
+		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getStationName1(),binf.getStationName2(),binf.getStationName(),binf.getBattGroupId()}, new CallBack() {
 			
 			public List getResults(ResultSet rs) {
 				List list=new ArrayList();

--
Gitblit v1.9.1