From e9d6bfd028178ad484ba7ccd9a6ad6d5aba64e15 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.20>
Date: 星期四, 29 十一月 2018 16:57:27 +0800
Subject: [PATCH] 续航

---
 gx_tieta/src/com/fgkj/dto/Batt_endurance.java |   52 ++++++++++++++++++++++++++++++++++------------------
 1 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dto/Batt_endurance.java b/gx_tieta/src/com/fgkj/dto/Batt_endurance.java
index 5d31eee..8fcc25a 100644
--- a/gx_tieta/src/com/fgkj/dto/Batt_endurance.java
+++ b/gx_tieta/src/com/fgkj/dto/Batt_endurance.java
@@ -9,8 +9,10 @@
 	private float real_cap;
 	private float moncapstd;
 	private float real_curr;
-	private int endurance_theory_timelong;//鐞嗚
-	private int endurance_actual_timelong;//瀹為檯
+	private float endurance_theory_timelong;//鐞嗚
+	private float endurance_actual_timelong;//瀹為檯
+	private float endurance_actual_timelong_max;//瀹為檯鏈�澶�
+	private float endurance_actual_timelong_min;//瀹為檯鏈�灏�
 	private int is_out_stand;
 	private String note;
 	private String stationName;
@@ -54,18 +56,29 @@
 	public void setReal_curr(float real_curr) {
 		this.real_curr = real_curr;
 	}
-	
-	public int getEndurance_theory_timelong() {
+	public float getEndurance_theory_timelong() {
 		return endurance_theory_timelong;
 	}
-	public void setEndurance_theory_timelong(int endurance_theory_timelong) {
+	public void setEndurance_theory_timelong(float endurance_theory_timelong) {
 		this.endurance_theory_timelong = endurance_theory_timelong;
 	}
-	public int getEndurance_actual_timelong() {
+	public float getEndurance_actual_timelong() {
 		return endurance_actual_timelong;
 	}
-	public void setEndurance_actual_timelong(int endurance_actual_timelong) {
+	public void setEndurance_actual_timelong(float endurance_actual_timelong) {
 		this.endurance_actual_timelong = endurance_actual_timelong;
+	}
+	public float getEndurance_actual_timelong_max() {
+		return endurance_actual_timelong_max;
+	}
+	public void setEndurance_actual_timelong_max(float endurance_actual_timelong_max) {
+		this.endurance_actual_timelong_max = endurance_actual_timelong_max;
+	}
+	public float getEndurance_actual_timelong_min() {
+		return endurance_actual_timelong_min;
+	}
+	public void setEndurance_actual_timelong_min(float endurance_actual_timelong_min) {
+		this.endurance_actual_timelong_min = endurance_actual_timelong_min;
 	}
 	public int getIs_out_stand() {
 		return is_out_stand;
@@ -97,17 +110,17 @@
 	public void setStationName2(String stationName2) {
 		this.stationName2 = stationName2;
 	}
-	public Page getPage() {
-		return page;
-	}
-	public void setPage(Page page) {
-		this.page = page;
-	}
 	public String getStationName5() {
 		return stationName5;
 	}
 	public void setStationName5(String stationName5) {
 		this.stationName5 = stationName5;
+	}
+	public Page getPage() {
+		return page;
+	}
+	public void setPage(Page page) {
+		this.page = page;
 	}
 	@Override
 	public String toString() {
@@ -116,12 +129,15 @@
 				+ ", moncapstd=" + moncapstd + ", real_curr=" + real_curr
 				+ ", endurance_theory_timelong=" + endurance_theory_timelong
 				+ ", endurance_actual_timelong=" + endurance_actual_timelong
-				+ ", is_out_stand=" + is_out_stand + ", note=" + note
-				+ ", stationName=" + stationName + ", stationName1="
-				+ stationName1 + ", stationName2=" + stationName2
-				+ ", stationName5=" + stationName5 + ", page=" + page + "]";
+				+ ", endurance_actual_timelong_max="
+				+ endurance_actual_timelong_max
+				+ ", endurance_actual_timelong_min="
+				+ endurance_actual_timelong_min + ", is_out_stand="
+				+ is_out_stand + ", note=" + note + ", stationName="
+				+ stationName + ", stationName1=" + stationName1
+				+ ", stationName2=" + stationName2 + ", stationName5="
+				+ stationName5 + ", page=" + page + "]";
 	}
-	
 	
 
 }

--
Gitblit v1.9.1