From 5fcb60a948de728b5c8833388656ca394ce70caa Mon Sep 17 00:00:00 2001
From: 军 <军@hp-pc>
Date: 星期一, 08 十月 2018 17:41:10 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/dao/impl/BatttestdatastopDAOImpl.java |    1 +
 1 files changed, 1 insertions(+), 0 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;

--
Gitblit v1.9.1