From e8ade47d453fd4667e0e2a5cafadba574a00dfba Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.28>
Date: 星期三, 24 十月 2018 17:34:27 +0800
Subject: [PATCH] 修改
---
gx_tieta/src/com/fgkj/dto/Batt_rtstate.java | 34 ++++++++++++++++++++++++++++++++--
gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java | 6 +++++-
2 files changed, 37 insertions(+), 3 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..8f467d3 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 " +
" 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,10 @@
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"));
if(rs.getInt("batt_test_type")==3){
dischar++;
}else if(rs.getInt("batt_test_type")==2){
diff --git a/gx_tieta/src/com/fgkj/dto/Batt_rtstate.java b/gx_tieta/src/com/fgkj/dto/Batt_rtstate.java
index 3e15a74..45fe5dd 100644
--- a/gx_tieta/src/com/fgkj/dto/Batt_rtstate.java
+++ b/gx_tieta/src/com/fgkj/dto/Batt_rtstate.java
@@ -22,7 +22,10 @@
private Integer batt_rest_power1_time;
private Integer batt_rest_power2_time;
private String note;
-
+ private String stationName;
+ private String stationName1;
+ private String stationName2;
+ private String stationName3;
public Integer getNum() {
return num;
}
@@ -132,6 +135,30 @@
public void setNote(String note) {
this.note = note;
}
+ public String getStationName() {
+ return stationName;
+ }
+ public void setStationName(String stationName) {
+ this.stationName = stationName;
+ }
+ public String getStationName1() {
+ return stationName1;
+ }
+ public void setStationName1(String stationName1) {
+ this.stationName1 = stationName1;
+ }
+ public String getStationName2() {
+ return stationName2;
+ }
+ public void setStationName2(String stationName2) {
+ this.stationName2 = stationName2;
+ }
+ public String getStationName3() {
+ return stationName3;
+ }
+ public void setStationName3(String stationName3) {
+ this.stationName3 = stationName3;
+ }
@Override
public String toString() {
return "Batt_rtstate [num=" + num + ", BattGroupId=" + BattGroupId
@@ -146,7 +173,10 @@
+ ", batt_rest_cap=" + batt_rest_cap
+ ", batt_rest_power1_time=" + batt_rest_power1_time
+ ", batt_rest_power2_time=" + batt_rest_power2_time
- + ", note=" + note + "]";
+ + ", note=" + note + ", stationName=" + stationName
+ + ", stationName1=" + stationName1 + ", stationName2="
+ + stationName2 + ", stationName3=" + stationName3 + "]";
}
+
}
--
Gitblit v1.9.1