From e0e1740b3df08e144c6dcd1a2998ec2dd409cf2a Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.25>
Date: 星期二, 30 十月 2018 15:54:49 +0800
Subject: [PATCH] 修改第三层
---
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 22 +++++++---------------
1 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index 841de97..d2f74f2 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -3410,12 +3410,13 @@
//鏌ヨ绠＄悊鐨勫幙/鍖�(宸︿晶瀵艰埅绗笁灞傦紝鏌ユ墍鏈夌殑鍘�/鍖�)
public List serchStationName5(Object obj){
BattInf binf=(BattInf) obj;
- String sql="select DISTINCT stationName5,StationName,StationName1,StationName2,StationName3,stationid,fbsdeviceid,FBSDeviceName " +
+ String sql="select DISTINCT stationName5,StationName1,StationName2 " +
" 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=?" +
" ) and StationName1 like ? and StationName2 like ? " +
" ORDER BY CONVERT( StationName USING gbk ) COLLATE gbk_chinese_ci ASC ";
+ //System.out.println(sql);
List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getNum(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%"},new CallBack() {
public List getResults(ResultSet rs) {
@@ -3423,14 +3424,9 @@
try {
while(rs.next()){
BattInf batt = new BattInf();
- batt.setStationName(rs.getString("stationName"));
batt.setStationName1(rs.getString("stationName1"));
batt.setStationName2(rs.getString("stationName2"));
- batt.setStationName3(rs.getString("stationName3"));
batt.setStationName5(rs.getString("stationName5"));
- batt.setStationId(rs.getString("stationId"));
- batt.setFBSDeviceName(rs.getString("fBSDeviceName"));
- batt.setFBSDeviceId(rs.getInt("fBSDeviceId"));
list.add(batt);
}
} catch (SQLException e) {
@@ -3445,7 +3441,7 @@
//鏌ヨ绠＄悊鐨勫幙/鍖�(宸︿晶瀵艰埅绗笁灞傦紝鏌ユ墍鏈夌殑鍘�/鍖�)
public List serchStationName5_all(Object obj){
BattInf binf=(BattInf) obj;
- String sql="select DISTINCT stationName5,StationName,StationName1,StationName2,StationName3,stationid,fbsdeviceid,FBSDeviceName " +
+ String sql="select DISTINCT stationName5,StationName1,StationName2 " +
" FROM db_battinf.tb_battinf " +
" where StationName1 like ? and StationName2 like ? " +
" ORDER BY CONVERT( StationName USING gbk ) COLLATE gbk_chinese_ci ASC ";
@@ -3456,14 +3452,9 @@
try {
while(rs.next()){
BattInf batt = new BattInf();
- batt.setStationName(rs.getString("stationName"));
batt.setStationName1(rs.getString("stationName1"));
batt.setStationName2(rs.getString("stationName2"));
- batt.setStationName3(rs.getString("stationName3"));
batt.setStationName5(rs.getString("stationName5"));
- batt.setStationId(rs.getString("stationId"));
- batt.setFBSDeviceName(rs.getString("fBSDeviceName"));
- batt.setFBSDeviceId(rs.getInt("fBSDeviceId"));
list.add(batt);
}
} catch (SQLException e) {
@@ -3934,10 +3925,11 @@
//List<BattInf> list=biml.serchGroupAssess(bmd);
//List<BattInf> list=biml.serchMakeGroup(binf);
//List<BattInf> list=biml.serchGroupByInfor(binf);
- List<BattInf> list=biml.searchInform1(bmd);
- for (BattInf b : list) {
+ //List<BattInf> list=biml.searchInform1(bmd);
+ List<BattInf> list=biml.serchStationName5(binf);
+ /*for (BattInf b : list) {
System.out.println(b);
- }
+ }*/
System.out.println(list.size());
}
--
Gitblit v1.9.1