From 2f10da83d8087ed1b47b8edc9ff29ca5248f504d Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.26>
Date: 星期一, 15 十月 2018 14:31:52 +0800
Subject: [PATCH] 基站统计

---
 gx_tieta/src/com/fgkj/services/BattInfServices.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/services/BattInfServices.java b/gx_tieta/src/com/fgkj/services/BattInfServices.java
index 3c6ac12..bd09022 100644
--- a/gx_tieta/src/com/fgkj/services/BattInfServices.java
+++ b/gx_tieta/src/com/fgkj/services/BattInfServices.java
@@ -830,7 +830,6 @@
 			    		Batttestdatastop sdata=new Batttestdatastop();
 			    		sdata.setBattGroupId(binf.getBattGroupId());
 			    		sdata.setNote(binf.getBattProducer());
-			    		sdata.setStationid(binf.getStationId());
 			    		sdata.setMon_num(j+1);
 			    		for (int z = 0; z < listr.size(); z++) {
 		    				BattInf_Rebuild brinf=(BattInf_Rebuild) listr.get(z);
@@ -875,11 +874,16 @@
 		    		b.setBattGroupName(binf.getBattGroupName());
 		    		b.setMonVolStd(binf.getMonVolStd());
 		    		b.setMonCapStd(binf.getMonCapStd());
+		    		b.setStationId(binf.getStationId());
 		    		b.setMonNum(j+1);
 		    		for (int z = 0; z < listr.size(); z++) {
 	    				BattInf_Rebuild brinf=(BattInf_Rebuild) listr.get(z);
 						if((j+1)==brinf.getNew_monum()&&b.getBattGroupId()==brinf.getNew_battgroupid()){
 							b.setBattProducer(brinf.getOld_battproducer());
+							b.setNum(1);
+						}
+						if((j+1)==brinf.getOld_monum()&&b.getBattGroupId()==brinf.getOld_battgroupid()){
+							b.setNum(0);
 						}
 					}
 		    		list_b.add(b);

--
Gitblit v1.9.1