From b3460365bca5a645e3e37d69dd606ae8bea8cbb0 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期一, 07 一月 2019 16:11:00 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index 649f185..fdeffd5 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -460,10 +460,11 @@
}
return dev_id;
}
- //鍒ゆ柇鏂板鐨勭數姹犵粍鏄惁瀛樺湪
+ //鍒ゆ柇鏂板鐨勬満鎴挎槸鍚﹀瓨鍦�
public List judgeBatt(Object obj){
BattInf binf=(BattInf) obj;
- String sql="select distinct stationid from db_battinf.tb_battinf where stationname=? limit 1";
+ String sql="select distinct(StationId) "
+ + "from db_battinf.tb_battinf where stationname=? limit 1";
List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getStationName()}, new CallBack() {
public List getResults(ResultSet rs) {
@@ -482,7 +483,8 @@
});
return list;
}
- //鍒ゆ柇鏂板鐨勭數姹犵粍鏄惁瀛樺湪
+
+ //鍒ゆ柇鏂板鐨勬満鎴挎槸鍚﹀瓨鍦�
public boolean judgeBattInOrNot(Object obj){
BattInf binf=(BattInf) obj;
String sql="select distinct stationid from db_battinf.tb_battinf where stationname=? limit 1";
@@ -4601,7 +4603,7 @@
BattInf binf = new BattInf();
binf.setNum(2);
binf.setBattGroupId(1000001);
- binf.setStationName("鐧捐壊");
+ binf.setStationName("骞胯タ鐪�-鐜夋灄-鐜夋灄鐜夊窞鍖鸿タ鍩庨噷-BTS璁惧");
binf.setStationName1("");
binf.setStationName2("");
binf.setStationName3("");
@@ -4649,15 +4651,17 @@
System.out.println(nums);*/
/*boolean bl=biml.judgeBattInOrNot(binf);
System.out.println(bl);*/
- List<BattInf> list=biml.serchByBatt_param(binf);
+ /*List<BattInf> list=biml.serchByBatt_param(binf);
for (BattInf b : list) {
System.out.println(b);
- }
+ }*/
/*List<BattInf> list=biml.serchByDischarge(binf);
for (BattInf b : list) {
System.out.println(b);
}*/
- System.out.println(list.size());
+ List list=biml.judgeBatt(binf);
+ System.out.println(list);
+ //System.out.println(list.size());
}
public List getResults(ResultSet rs) {
--
Gitblit v1.9.1