From d71f23c95d125f3e80aa24642d0ecb21d8216317 Mon Sep 17 00:00:00 2001
From: 星伟 <星伟@192.168.10.25>
Date: 星期四, 27 九月 2018 17:40:52 +0800
Subject: [PATCH] 放电计划添加市级筛选

---
 gx_tieta/src/com/fgkj/dao/impl/BattDischarge_planImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattDischarge_planImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattDischarge_planImpl.java
index ada8223..74da16d 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattDischarge_planImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattDischarge_planImpl.java
@@ -304,7 +304,7 @@
 				" and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id  " +
 				" and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid  " +
 				" and db_user.tb_user_inf.uid=? " +
-				" and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ?)";
+				" and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ?)";
 		baseSql+=userSql;
 		
 		String endSql="order by tb_battdischarge_plan.discharge_starttime desc ";
@@ -320,6 +320,7 @@
 			                 uinf.getUId(),
 			                 "%"+binf.getStationName1()+"%",
 		                	 "%"+binf.getStationName()+"%",
+		                	 "%"+binf.getStationName2()+"%",
 			                 (bmd.getPage().getPageCurr() - 1)* bmd.getPage().getPageSize(),
 			                 bmd.getPage().getPageSize()
 			                 }, new CallBack() {

--
Gitblit v1.9.1