From 93bfff929bb28f4e1f10caf4bf1c3ce765baf363 Mon Sep 17 00:00:00 2001 From: 星伟 <星伟@192.168.10.25> Date: 星期四, 27 九月 2018 15:39:50 +0800 Subject: [PATCH] 设备告警历史查询加市级筛选 --- gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java index a3346ad..c30fcd1 100644 --- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java +++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java @@ -1629,7 +1629,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 db_battinf.tb_battinf.battgroupid asc "; @@ -1639,7 +1639,7 @@ sql=baseSql+endSql+limitSql; //System.out.println(sql); List<BattInf> list=DAOHelper.executeQueryLimit(sql,conn, new Object[]{ - binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%", + binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%","%"+binf.getStationName2()+"%", (page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() { public List getResults(ResultSet rs) { @@ -1850,7 +1850,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 test_typeA="";//鍏ㄩ儴 @@ -1886,7 +1886,7 @@ //System.out.println(sql); List<BattInf> list=DAOHelper.executeQuery(sql,DBUtil.getConn(), new Object[]{ tinf.getRecord_time(),tinf.getRecord_time1() - ,binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%" + ,binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%","%"+binf.getStationName2()+"%" }, new CallBack() { public List getResults(ResultSet rs) { @@ -3304,7 +3304,7 @@ //鏌ヨ绠$悊鐨勬満鎴�(宸︿晶瀵艰埅绗笁灞傦紝鏌ユ墍鏈夌殑鏈烘埧,num涓瓨鏀緐id) public List serchStationName3(Object obj){ BattInf binf=(BattInf) obj; - String sql="select DISTINCT StationName1,StationName2,StationName3,stationid,fbsdeviceid " + + String sql="select DISTINCT StationName1,StationName2,StationName3,stationid,fbsdeviceid,FBSDeviceName " + " FROM db_battinf.tb_battinf " + " where StationId in(" + " select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id and db_user.tb_user_battgroup_baojigroup_usr.uId=?" + @@ -3321,6 +3321,7 @@ batt.setStationName2(rs.getString("stationName2")); batt.setStationName3(rs.getString("stationName3")); batt.setStationId(rs.getString("stationId")); + batt.setFBSDeviceName(rs.getString("fBSDeviceName")); batt.setFBSDeviceId(rs.getInt("fBSDeviceId")); list.add(batt); } -- Gitblit v1.9.1