From eeff0e75180a127e83e9c691e805fdab543e8581 Mon Sep 17 00:00:00 2001
From: 星伟 <星伟@192.168.10.25>
Date: 星期四, 27 九月 2018 10:07:36 +0800
Subject: [PATCH] 电池组的serchBymonNum
---
gx_tieta/src/com/fgkj/dao/impl/Batt_attentionImpl.java | 10 +++++++++-
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 7 ++++---
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index 954dce4..786bdb0 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -981,7 +981,7 @@
// batt.setStationName(rs.getString("StationName"));
batt.setBattGroupName(rs.getString("battGroupName"));
batt.setMonCount(rs.getInt("monCount"));
- batt.setMonNum(Integer.parseInt(rs.getString("signalname").split("#")[0]));
+ //batt.setMonNum(Integer.parseInt(rs.getString("signalname").split("#")[0]));
//System.out.println(batt);
list.add(batt);
}
@@ -3473,7 +3473,7 @@
BattInfImpl biml = new BattInfImpl();
BattInf binf = new BattInf();
- binf.setBattGroupId(0);
+ binf.setBattGroupId(1000967);
binf.setStationName("鍐呰挋鍙�");
binf.setStationName1("鍐呰挋鍙�");
@@ -3500,7 +3500,8 @@
bmd.setUinf(uinf);
//List<BattInf> list = biml.serchByConditionNew(bmd);
//List<BattInf> list=biml.serchByTestType(bmd);
- List<BattInf> list=biml.serchGroupAssess(bmd);
+ //List<BattInf> list=biml.serchGroupAssess(bmd);
+ List<BattInf> list=biml.serchByMonNum(binf);
for (BattInf b : list) {
System.out.println(b);
}
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..f04b312 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_attentionImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_attentionImpl.java
@@ -86,6 +86,14 @@
}else{
baseSql+=station1SqlF;
}
+ //鐢ㄤ簬甯傜骇绛涢��
+ String station2SqlT=" and stationname2!=? ";//鍏ㄩ儴
+ String station2SqlF=" and stationname2=? ";
+ if(binf.getStationName2().equals("")){
+ baseSql+=station2SqlT;
+ }else{
+ baseSql+=station2SqlF;
+ }
//鐢ㄤ簬鏈烘埧绔欑偣
String stationSqlT=" and stationname!=? ";//鍏ㄩ儴
String stationSqlF=" and stationname=? ";
@@ -118,7 +126,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.getStationName(),binf.getBattGroupId(),binf.getMonNum()
,(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
public List getResults(ResultSet rs) {
--
Gitblit v1.9.1