From c51674f412a53fc9eb6a9453fc3ac4a6ffd89a1d Mon Sep 17 00:00:00 2001 From: 81041 <81041@192.168.10.31> Date: 星期三, 31 十月 2018 10:37:00 +0800 Subject: [PATCH] 电池充放电数据管理加省市结果 --- gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java index 38f8ff1..067a544 100644 --- a/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java +++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java @@ -126,7 +126,7 @@ //娴嬭瘯鏁版嵁鈥斺�斿疄鏃舵煡璇腑宸︿笅瑙掔殑鍏呮斁鐢电粺璁�(鐢ㄦ埛绠$悊鐨勬満鎴�) public List serchDisOrChargrNew(Object obj){ User_inf uinf=(User_inf) obj; - String sql=" SELECT distinct db_ram_db.tb_batt_rtstate.battgroupid,batt_test_type,stationid,fbsdeviceid" + + String sql=" SELECT distinct db_ram_db.tb_batt_rtstate.battgroupid,batt_test_type,stationid,fbsdeviceid,stationName,stationName1,stationName2,stationName3,stationName5 " + " from db_ram_db.tb_batt_rtstate,db_battinf.tb_battinf " + " where batt_test_type IN(2,3) " + " and db_ram_db.tb_batt_rtstate.battgroupid=db_battinf.tb_battinf.BattGroupId " + @@ -150,6 +150,11 @@ bstate.setBatt_test_type(rs.getInt("batt_test_type")); bstate.setNote(rs.getString("stationid")); bstate.setBatt_test_tlong(rs.getInt("fbsdeviceid")); + bstate.setStationName(rs.getString("stationName")); + bstate.setStationName1(rs.getString("stationName1")); + bstate.setStationName2(rs.getString("stationName2")); + bstate.setStationName3(rs.getString("stationName3")); + bstate.setStationName5(rs.getString("stationName5")); if(rs.getInt("batt_test_type")==3){ dischar++; }else if(rs.getInt("batt_test_type")==2){ -- Gitblit v1.9.1