From ed31d75faf1034fbedeb301042c77258933cbf7b Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.23>
Date: 星期四, 01 十一月 2018 10:21:50 +0800
Subject: [PATCH] 放电计划查询加区县

---
 gx_tieta/src/com/fgkj/dao/impl/BattDischarge_planImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 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 74da16d..2c6f0d9 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattDischarge_planImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattDischarge_planImpl.java
@@ -284,7 +284,7 @@
 				"tb_battdischarge_plan.discharge_state,tb_battdischarge_plan.discharge_reason,tb_battdischarge_plan.discharge_cleartype,tb_battdischarge_plan.note," +
 				"tb_battdischarge_plan.preset_time,tb_battdischarge_plan.preset_cap,tb_battdischarge_plan.preset_monvol,tb_battdischarge_plan.preset_groupvol,tb_battdischarge_plan.preset_curr,tb_battdischarge_plan.preset_mon," +
 				"tb_battdischarge_plan.dcvolhighlimit,tb_battdischarge_plan.chargecurrset, " +
-				"db_battinf.tb_battinf.stationname1,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.battGroupName  "+
+				"db_battinf.tb_battinf.stationname1,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationname5,db_battinf.tb_battinf.battGroupName  "+
 				"from web_site.tb_battdischarge_plan  " +
 				"left outer join db_battinf.tb_battinf on tb_battdischarge_plan.battgroupid=db_battinf.tb_battinf.battgroupid  "+
 				"where tb_battdischarge_plan.discharge_starttime>=?  and tb_battdischarge_plan.discharge_starttime<=? " +
@@ -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.stationname2 like ?)";
+				" and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ? and db_battinf.tb_battinf.stationname5 like ? )";
 		baseSql+=userSql;
 		
 		String endSql="order by tb_battdischarge_plan.discharge_starttime desc ";
@@ -321,6 +321,7 @@
 			                 "%"+binf.getStationName1()+"%",
 		                	 "%"+binf.getStationName()+"%",
 		                	 "%"+binf.getStationName2()+"%",
+		                	 "%"+binf.getStationName5()+"%",
 			                 (bmd.getPage().getPageCurr() - 1)* bmd.getPage().getPageSize(),
 			                 bmd.getPage().getPageSize()
 			                 }, new CallBack() {
@@ -333,6 +334,7 @@
 											BattDischarge_plan bplan=new BattDischarge_plan();
 											binf.setStationName(rs.getString("stationName"));
 											binf.setStationName1(rs.getString("stationName1"));
+											binf.setStationName5(rs.getString("stationName5"));
 											binf.setBattGroupName(rs.getString("battGroupName"));
 											
 											bplan.setNum(rs.getInt("num"));

--
Gitblit v1.9.1