From 5f73148bd85016ac62586e030c2a4cccccfacf47 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.33>
Date: 星期四, 11 十月 2018 10:19:56 +0800
Subject: [PATCH] 电池配组记录添加

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

diff --git a/gx_tieta/src/com/fgkj/services/BattInfServices.java b/gx_tieta/src/com/fgkj/services/BattInfServices.java
index b81a4fd..16d3dec 100644
--- a/gx_tieta/src/com/fgkj/services/BattInfServices.java
+++ b/gx_tieta/src/com/fgkj/services/BattInfServices.java
@@ -858,6 +858,42 @@
 		}
 		return model;
 	}
+	//鐢垫睜閰嶇粍绠$悊(閲嶈)
+	public ServiceModel serchGroupByInfor(Object obj){
+		List<BattInf> list=((BattInfImpl)dao).serchGroupByInfor(obj);
+		List list_b=new ArrayList();
+		if(list!=null&&list.size()>0){
+			for(int i=0;i<list.size();i++){
+				BattInf binf=list.get(i);
+				List<BattInf_Rebuild> listr=(List<BattInf_Rebuild>) binf.getObj();
+				for (int j = 0; j <binf.getMonCount(); j++) {
+		    		BattInf b=new BattInf();
+		    		b.setBattGroupId(binf.getBattGroupId());
+		    		b.setBattProducer(binf.getBattProducer());
+		    		b.setStationName(binf.getStationName());
+		    		b.setBattGroupName(binf.getBattGroupName());
+		    		b.setMonVolStd(binf.getMonVolStd());
+		    		b.setMonCapStd(binf.getMonCapStd());
+		    		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());
+						}
+					}
+		    		list_b.add(b);
+				}
+			}
+			model.setCode(1);
+			model.setData(list_b);
+			model.setMsg("鏌ヨ鎴愬姛!");
+		}else{
+			model.setCode(0);
+			model.setMsg("鏌ヨ澶辫触!");
+		}
+		return model;
+	}
+
 	public static void main(String[] args) {
 		//new BattInfServices().findMenu();
 		BattInf b=new BattInf();

--
Gitblit v1.9.1