From fd1f11f6d7a75c52a7c2db5fe9a39e129216b96a Mon Sep 17 00:00:00 2001
From: 星伟 <星伟@192.168.10.27>
Date: 星期日, 30 九月 2018 11:20:38 +0800
Subject: [PATCH] 电池组配租加容量百分比
---
gx_tieta/src/com/fgkj/dao/impl/BatttestdatastopDAOImpl.java | 1 +
gx_tieta/src/com/fgkj/dto/Batttestdatastop.java | 13 +++++++++++--
gx_tieta/src/com/fgkj/services/BattInfServices.java | 3 ++-
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BatttestdatastopDAOImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BatttestdatastopDAOImpl.java
index 9f9e6f1..9edaba7 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BatttestdatastopDAOImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BatttestdatastopDAOImpl.java
@@ -490,6 +490,7 @@
realCap=(new BatttestdataDAOImpl()).serchRealCap(sdata);
}
sdata.setTest_cap((float)realCap);
+ sdata.setPercent((float)(realCap/STDAH));
}
}
return list;
diff --git a/gx_tieta/src/com/fgkj/dto/Batttestdatastop.java b/gx_tieta/src/com/fgkj/dto/Batttestdatastop.java
index 3a971dc..61a4c52 100644
--- a/gx_tieta/src/com/fgkj/dto/Batttestdatastop.java
+++ b/gx_tieta/src/com/fgkj/dto/Batttestdatastop.java
@@ -24,7 +24,7 @@
private Float mon_avg;
private Float mon_min;
private Float mon_max;
-
+ private float percent;
public Batttestdatastop() {
}
@@ -189,6 +189,14 @@
public void setMon_max(Float mon_max) {
this.mon_max = mon_max;
}
+
+ public float getPercent() {
+ return percent;
+ }
+
+ public void setPercent(float percent) {
+ this.percent = percent;
+ }
@Override
public String toString() {
@@ -202,10 +210,11 @@
+ ", test_cap=" + test_cap + ", mon_num=" + mon_num
+ ", mon_vol=" + mon_vol + ", lowC=" + lowC + ", lowV=" + lowV
+ ", mon_avg=" + mon_avg + ", mon_min=" + mon_min
- + ", mon_max=" + mon_max + "]";
+ + ", mon_max=" + mon_max + ", percent=" + percent + "]";
}
+
diff --git a/gx_tieta/src/com/fgkj/services/BattInfServices.java b/gx_tieta/src/com/fgkj/services/BattInfServices.java
index 0875b15..9561969 100644
--- a/gx_tieta/src/com/fgkj/services/BattInfServices.java
+++ b/gx_tieta/src/com/fgkj/services/BattInfServices.java
@@ -768,7 +768,8 @@
for (int j = 0; j <binf.getMonCount(); j++) {
Batttestdatastop sdata=new Batttestdatastop();
sdata.setMon_num(j+1);
- sdata.setTest_cap(binf.getMonCapStd()/binf.getMonCount());//娌℃湁鏀剧數榛樿涓烘爣绉�
+ sdata.setTest_cap(binf.getMonCapStd());//娌℃湁鏀剧數榛樿涓烘爣绉�
+ sdata.setPercent(1f);
list_sdata.add(sdata);
}
}
--
Gitblit v1.9.1