From 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期六, 19 一月 2019 09:16:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/Batt_attentionImpl.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_attentionImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_attentionImpl.java
index dc13c8c..c7e8e89 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_attentionImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_attentionImpl.java
@@ -71,7 +71,7 @@
String numberSql=" SELECT FOUND_ROWS() number";
String sql="";
String baseSql=" select SQL_CALC_FOUND_ROWS web_site.tb_batt_attention.battgroupid,web_site.tb_batt_attention.monnum" +
- ",db_battinf.tb_battinf.battgroupid,db_battinf.tb_battinf.stationid,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationname1,db_battinf.tb_battinf.battgroupname,db_battinf.tb_battinf.moncapstd,db_battinf.tb_battinf.monvolstd " +
+ ",db_battinf.tb_battinf.battgroupid,db_battinf.tb_battinf.stationid,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationname1,db_battinf.tb_battinf.stationname2,db_battinf.tb_battinf.stationname5,db_battinf.tb_battinf.battgroupname,db_battinf.tb_battinf.moncapstd,db_battinf.tb_battinf.monvolstd " +
",db_ram_db.tb_batt_rtdata.mon_vol "+
" from web_site.tb_batt_attention,db_battinf.tb_battinf,db_ram_db.tb_batt_rtdata " +
" where web_site.tb_batt_attention.battgroupid=db_battinf.tb_battinf.battgroupid " +
@@ -85,6 +85,22 @@
baseSql+=station1SqlT;
}else{
baseSql+=station1SqlF;
+ }
+ //鐢ㄤ簬甯傜骇绛涢��
+ String station2SqlT=" and stationname2!=? ";//鍏ㄩ儴
+ String station2SqlF=" and stationname2=? ";
+ if(binf.getStationName2().equals("")){
+ baseSql+=station2SqlT;
+ }else{
+ baseSql+=station2SqlF;
+ }
+ //鐢ㄤ簬鍖哄幙绛涢��
+ String station5SqlT=" and stationname5!=? ";//鍏ㄩ儴
+ String station5SqlF=" and stationname5=? ";
+ if(binf.getStationName5().equals("")){
+ baseSql+=station5SqlT;
+ }else{
+ baseSql+=station5SqlF;
}
//鐢ㄤ簬鏈烘埧绔欑偣
String stationSqlT=" and stationname!=? ";//鍏ㄩ儴
@@ -118,7 +134,7 @@
//System.out.println(sql);
List<BattInf> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{
binf.getNum()
- ,binf.getStationName1(),binf.getStationName(),binf.getBattGroupId(),binf.getMonNum()
+ ,binf.getStationName1(),binf.getStationName2(),binf.getStationName5(),binf.getStationName(),binf.getBattGroupId(),binf.getMonNum()
,(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
public List getResults(ResultSet rs) {
@@ -131,6 +147,8 @@
binf.setStationId(rs.getString("stationId"));
binf.setStationName(rs.getString("stationName"));
binf.setStationName1(rs.getString("stationName1"));
+ binf.setStationName2(rs.getString("stationName2"));
+ binf.setStationName5(rs.getString("stationName5"));
binf.setBattGroupName(rs.getString("battGroupName"));
binf.setMonCapStd(rs.getFloat("monCapStd"));
binf.setMonVolStd(rs.getFloat("monVolStd"));
--
Gitblit v1.9.1