From a185180d8e0add7162d7a42c8755546c3f15efee Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.30>
Date: 星期三, 14 十一月 2018 17:33:52 +0800
Subject: [PATCH] 放电的图表

---
 gx_tieta/src/com/fgkj/services/BatttestdataService.java |   37 +++++++++++++++++++++++++++++++++----
 1 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/services/BatttestdataService.java b/gx_tieta/src/com/fgkj/services/BatttestdataService.java
index 5c4e726..b6b7023 100644
--- a/gx_tieta/src/com/fgkj/services/BatttestdataService.java
+++ b/gx_tieta/src/com/fgkj/services/BatttestdataService.java
@@ -34,11 +34,39 @@
 			if(list!=null && list.size()>0){
 				model.setCode(1);
 				model.setData(list);
+				model.setMsg("鏌ヨ鎴愬姛!");
+			}else{
+				model.setCode(0);
+				model.setMsg("鏌ヨ澶辫触!");
 			}
 		}
 		return model;
 	}
-	
+	//鍘嗗彶鐩戞祴鈥斺�旀姌绾垮浘<-------璺ㄥ煙----------->
+	public ServiceModel serchByCondition_ky(Object obj){
+		Batttestdata btd=(Batttestdata)obj;
+		btd.setRecord_num(0);
+		btd.setNum(0);
+		btd.setTest_type(0);
+		if(btd.getBattGroupId()!=null && btd.getTest_record_count()!=null){
+		List<Batttestdata> listM=(new BatttestdataDAOImpl()).serchMaxAndMintime(btd);
+			if(listM!=null&&listM.size()>0){
+				btd.setNum(listM.get(listM.size()-1).getNum());
+				btd.setTest_type(listM.get(listM.size()-1).getTest_type());
+				btd.setRecord_num(listM.get(listM.size()-1).getRecord_num());
+			}
+			List<List<Batttestdata>> list = ((BatttestdataDAOImpl)dao).serchByCondition_ky(btd);	
+			if(list!=null && list.size()>0){
+				model.setCode(1);
+				model.setData(list);
+				model.setMsg("鏌ヨ鎴愬姛!");
+			}else{
+				model.setCode(0);
+				model.setMsg("鏌ヨ澶辫触!");
+			}
+		}
+		return model;
+	}
 	public List checkBattTestData(Object obj){
 		List listnew = new ArrayList<Batttestdata>();
 		List<Batttestdata> list = (List<Batttestdata>)obj;
@@ -54,10 +82,11 @@
 	
 	public static void main(String[] args) {
 		Batttestdata b = new Batttestdata();
-		b.setBattGroupId(1000010);
-		b.setTest_record_count(37);
+		b.setBattGroupId(1002085);
+		b.setTest_record_count(1);
 		BatttestdataService service = new BatttestdataService();
-		service.serchByCondition(b);
+		ServiceModel model=service.serchByCondition_ky(b);
+		System.out.println(model.getData());
 	}
 	
 }

--
Gitblit v1.9.1