From 7b8e271ed8344866c0dbe56942625ccedb5564c7 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 02 十一月 2018 17:31:00 +0800
Subject: [PATCH] 问题反馈
---
gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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..e848fa2 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){
@@ -599,7 +604,7 @@
",tb_batt_rtdata.BattGroupId,tb_batt_rtdata.rec_datetime,mon_num,mon_vol,mon_tmp," +
"mon_res,mon_ser,mon_conn_res,mon_cap" +
",db_battinf.tb_battinf.moncapstd,db_battinf.tb_battinf.monvolstd " +
- ",db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationname1,db_battinf.tb_battinf.BattGroupName,db_battinf.tb_battinf.deviceName " +
+ ",db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationname1,db_battinf.tb_battinf.stationname2,db_battinf.tb_battinf.stationname5,db_battinf.tb_battinf.BattGroupName,db_battinf.tb_battinf.deviceName " +
",max(binary tb_batt_rtdata.mon_vol) as maxmonvol,min(binary tb_batt_rtdata.mon_vol) as minmonvol " +
"FROM db_ram_db.tb_batt_rtstate " +
"LEFT OUTER JOIN db_ram_db.tb_batt_rtdata ON tb_batt_rtstate.BattGroupId = tb_batt_rtdata.BattGroupId " +
@@ -622,7 +627,7 @@
" and db_user.tb_user_inf.uid=? )";
baseSql+=userSql;
//鏈烘埧缁存姢鍖洪�夋嫨
- String stationSql=" AND db_battinf.tb_battinf.stationname like ? AND db_battinf.tb_battinf.stationname1 like ? AND db_battinf.tb_battinf.stationname2 like ? ";
+ String stationSql=" AND db_battinf.tb_battinf.stationname like ? AND db_battinf.tb_battinf.stationname1 like ? AND db_battinf.tb_battinf.stationname2 like ? AND db_battinf.tb_battinf.stationname5 like ? ";
baseSql+=stationSql;
//鐢垫睜鐘舵��
String stateSqlT=" AND batt_state=? ";
@@ -638,7 +643,7 @@
String limitSql=" limit ?,?";
sql=baseSql+endSql+limitSql;
//System.out.println(sql);
- List<Batt_State> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%"
+ List<Batt_State> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%"
,binf.getNum(),(page.getPageCurr() - 1)*page.getPageSize(),
page.getPageSize()}, new CallBack() {
@@ -680,7 +685,8 @@
binf.setDeviceName(rs.getString("deviceName"));
binf.setStationName(rs.getString("stationName"));
binf.setStationName1(rs.getString("stationName1"));
-
+ binf.setStationName2(rs.getString("stationName2"));
+ binf.setStationName5(rs.getString("stationName5"));
binf.setStationName9(BattTestData.battState(rs.getInt("batt_state")));
state.setBstate(bstate);
--
Gitblit v1.9.1