From 99285fcc7d30e62f1e84e1c96d29d0ffcd9ccdbc Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.30>
Date: 星期三, 14 十一月 2018 17:33:27 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java
index 72459a3..8a918d8 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java
@@ -62,7 +62,7 @@
//琛ㄦ牸鏄剧ず鎵归噺鎻掑叆鐨勬満鎴夸俊鎭�
public List serchInserStation(Object obj){
BattInf binf=(BattInf) obj;
- String sql="SELECT DISTINCT fBSDeviceId,stationId,stationname,stationname1,stationname2,stationname3,stationname5 from db_battinf.tb_battinf " +
+ String sql="SELECT DISTINCT fBSDeviceId,fBSDeviceName,stationId,stationname,stationname1,stationname2,stationname3,stationname5 from db_battinf.tb_battinf " +
" where ";
//鏉′欢
String sql0=" stationid=? "; //鍏蜂綋鏈烘埧
@@ -116,7 +116,7 @@
//鎵归噺鍗囩骇鍓嶉獙璇佸崌绾х殑璁惧蹇呴』澶勪簬鍦ㄧ嚎鐩戞祴鐘舵��(9100state鐨剋orkstate涓�0)
public List judgeStation(Object obj){
List<Integer> list=(List<Integer>) obj;
- String sql=" select distinct dev_id,db_battinf.tb_battinf.stationname3 from db_ram_db.tb_fbs9100_state,db_battinf.tb_battinf " +
+ String sql=" select distinct dev_id,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationname3 from db_ram_db.tb_fbs9100_state,db_battinf.tb_battinf " +
" where db_ram_db.tb_fbs9100_state.dev_id=db_battinf.tb_battinf.fBSDeviceId and dev_workstate=0 and dev_id in(";
String devSql="";
Object[] object=new Object[list.size()];
@@ -142,6 +142,7 @@
while(rs.next()){
BattInf binf=new BattInf();
binf.setFBSDeviceId(rs.getInt("dev_id"));
+ binf.setStationName(rs.getString("stationName"));
binf.setStationName3(rs.getString("stationName3"));
list.add(binf);
}
--
Gitblit v1.9.1