From 929449c99fbfeade6dbafae1c06c79cec22e7f61 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.30>
Date: 星期三, 14 十一月 2018 17:01:37 +0800
Subject: [PATCH] 电池组放电记录查询<-------跨域>
---
gx_tieta/src/com/fgkj/services/Batttestdata_infService.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/Batttestdata_infService.java b/gx_tieta/src/com/fgkj/services/Batttestdata_infService.java
index 0515fb6..d93eb39 100644
--- a/gx_tieta/src/com/fgkj/services/Batttestdata_infService.java
+++ b/gx_tieta/src/com/fgkj/services/Batttestdata_infService.java
@@ -30,10 +30,12 @@
model=new ServiceModel();
dao=BaseDAOFactory.getBaseDAO(BaseDAO.BATTTESTDATA_INF);
daoB=BaseDAOFactory.getBaseDAO(BaseDAO.BATTINF);
- }
-
- public ServiceModel serchByCondition(Object obj){
model=new ServiceModel();
+ }
+ /**
+ * 鏍规嵁鐢垫睜缁刬d鏌ヨ鐢垫睜缁勭殑inf琛ㄤ腑鐨勬斁鐢典俊鎭�
+ */
+ public ServiceModel serchByCondition(Object obj){
List<Batttestdata_inf> list=dao.serchByCondition(obj);
if(list!=null && list.size()>0){
model=judge(obj);
@@ -42,16 +44,25 @@
model.setData(list);
}
}
-// for (Batttestdata_inf u :list) {
-// System.out.println(u);
-// }
return model;
}
-
+ /**
+ * 鏍规嵁鐢垫睜缁刬d鏌ヨ鐢垫睜缁勭殑inf琛ㄤ腑鐨勬斁鐢典俊鎭�<-------璺ㄥ煙----------->
+ */
+ public ServiceModel serchByCondition_ky(Object obj){
+ List<Batttestdata_inf> list=((Batttestdata_infDAOImpl)dao).serchByCondition_ky(obj);
+ if(list!=null && list.size()>0){
+ model=judge(obj);
+ if(model.getCode()!=0){
+ model.setCode(1);
+ model.setData(list);
+ }
+ }
+ return model;
+ }
//娴嬭瘯battgroupid鍦╞atttestdata_inf涓槸鍚﹀瓨鍦�
public ServiceModel judge(Object obj){
- model=new ServiceModel();
Batttestdata_inf bti=(Batttestdata_inf)obj;
if(bti.getBattGroupId()!=null){
//System.out.println(bti.getBattGroupId());
@@ -69,7 +80,6 @@
//1.2/1.3鐢垫睜缁勭粺璁″垎鏋愭煡璇�
public ServiceModel serchByTestType1(Object obj){
Batttestdata_inf binf=(Batttestdata_inf) obj;
- model=new ServiceModel();
if(binf.getTest_type()==2){
List<Batttestdata_inf> list2=((Batttestdata_infDAOImpl)dao).serchByTestType2(binf);
List<Batttestdata_inf> list3=((Batttestdata_infDAOImpl)dao).serchByTestType3(binf);
--
Gitblit v1.9.1