From 51ecd84c0ca0065e7dcb729fd90876378d19e162 Mon Sep 17 00:00:00 2001
From: 星伟 <星伟@192.168.10.25>
Date: 星期四, 27 九月 2018 08:54:50 +0800
Subject: [PATCH] 电池组信息配置添加市级的查询条件
---
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index dc51a74..954dce4 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -168,10 +168,10 @@
+ "FBSDeviceName,GroupIndexInFBSDevice,battgroupId,BattGroupNum,BattGroupName,FloatVolLevel,OfflineVolLevel,BattFloatCurrent" +
",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate " +
" From db_battinf.tb_battinf " +
- " Where StationName like ? and StationName1 like ? " +
+ " Where StationName like ? and StationName1 like ? and StationName2 like ? " +
" order by StationId " +
" limit ?,?";
- List<BattInf> list=DAOHelper.executeQueryLimit(sql,conn, new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%",(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()},new CallBack() {
+ List<BattInf> list=DAOHelper.executeQueryLimit(sql,conn, new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%",(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()},new CallBack() {
public List getResults(ResultSet rs) {
List list = new ArrayList<BattInf>();
@@ -3304,7 +3304,7 @@
//鏌ヨ绠＄悊鐨勬満鎴�(宸︿晶瀵艰埅绗笁灞傦紝鏌ユ墍鏈夌殑鏈烘埧,num涓瓨鏀緐id)
public List serchStationName3(Object obj){
BattInf binf=(BattInf) obj;
- String sql="select DISTINCT StationName3,stationid,fbsdeviceid " +
+ String sql="select DISTINCT StationName1,StationName2,StationName3,stationid,fbsdeviceid " +
" 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=?" +
@@ -3317,6 +3317,8 @@
try {
while(rs.next()){
BattInf batt = new BattInf();
+ batt.setStationName1(rs.getString("stationName1"));
+ batt.setStationName2(rs.getString("stationName2"));
batt.setStationName3(rs.getString("stationName3"));
batt.setStationId(rs.getString("stationId"));
batt.setFBSDeviceId(rs.getInt("fBSDeviceId"));
@@ -3337,13 +3339,19 @@
public List serchBattByStation(Object obj){
BattInf binf=(BattInf) obj;
String sql="select DISTINCT StationName,StationId,StationIP,FBSDeviceId,BattGroupName,BattGroupName1,BattGroupName2,MonCount,battgroupId,MonCapStd,MonVolStd,MonResStd,MonSerStd,BattProducer,BattInUseDate,GroupIndexInFBSDevice " +
- "from db_battinf.tb_battinf where stationid=? " +
- "and StationId in(" +
+ "from db_battinf.tb_battinf where StationName1 like ? and StationName2 like ? and StationName3 like ? ";
+ //鏈烘埧id
+ String idSqlT=" and Stationid like ? ";
+ sql+=idSqlT;
+ //鐢ㄦ埛绠＄悊
+ String userSql=" and 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=?" +
- " ) " +
- "ORDER BY StationName1,battgroupId ";
+ " ) ";
+ sql+=userSql;
+ //鎺掑簭
+ String orderSql=" ORDER BY StationName1,battgroupId ";
//System.out.println(sql);
- List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),new Object[]{binf.getStationId(),binf.getNum()},new CallBack() {
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),new Object[]{"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationId()+"%",binf.getNum()},new CallBack() {
public List getResults(ResultSet rs) {
List list = new ArrayList();
--
Gitblit v1.9.1