From 9dc2284659816c2a73e8483a44e8977d090f65c1 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.127>
Date: 星期四, 10 一月 2019 14:52:23 +0800
Subject: [PATCH] 批量核容测试中去除单体数量和标称单体电压添加负载电流和在线电压
---
gx_tieta/src/com/fgkj/services/Battalarm_dataService.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java b/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
index 5969b67..958707c 100644
--- a/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
+++ b/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
@@ -176,13 +176,28 @@
//3.1鐢垫睜鍛婅瀹炴椂鏌ヨ
public ServiceModel serchByCondition(Object obj){
model=new ServiceModel();
- List<Batt_Maint_Dealarm> list=dao.serchByCondition(obj);
+ List list=dao.serchByCondition(obj);
if(list!=null && list.size()>1){
model.setCode(1);
model.setData(list);
}else {
model.setCode(0);
model.setData(list);
+ }
+ return model;
+ }
+ //3.1鐢垫睜鍛婅瀹炴椂鏌ヨ<***********璺ㄥ煙涓撶敤**************>
+ public ServiceModel serchByCondition_ky(Object obj){
+ model=new ServiceModel();
+ List list=((Battalarm_dataDAOImpl)dao).serchByCondition_ky(obj);
+ if(list!=null && list.size()>1){
+ model.setCode(1);
+ model.setData(list);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ }else {
+ model.setCode(0);
+ model.setData(list);
+ model.setMsg("鏌ヨ澶辫触!");
}
return model;
}
@@ -289,7 +304,7 @@
adata.setNum(numZ);//瀹炴椂鍛婅鎬绘暟
model.setCode(1);
model.setData(adata);
- System.out.println(model.getData());
+ //System.out.println(model.getData());
return model;
}
--
Gitblit v1.9.1