From a9f1943bdacb0aae1be2c7b55c4cf402c734019f Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.30>
Date: 星期六, 17 十一月 2018 11:09:37 +0800
Subject: [PATCH] 电池组单体统计分析查询页面中的容量计算公式中的test_curr使用平均电流计算
---
gx_tieta/src/com/fgkj/services/ram/Fbs9100_stateService.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_stateService.java b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_stateService.java
index 6908eb2..3cd5fad 100644
--- a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_stateService.java
+++ b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_stateService.java
@@ -71,10 +71,21 @@
}
//11.1FBS9100璁惧閫氫俊鐘舵�佹煡璇�
public ServiceModel serchByCondition(Object obj){
- List list=new ArrayList();
- Fbs9100_state fs=(Fbs9100_state) obj;
//FBS9100鏁版嵁
- list = dao.serchByCondition(fs);
+ List list = dao.serchByCondition(obj);
+ if(list!=null && list.size()>0){
+ model.setCode(1);
+ model.setData(list);
+ }else{
+ model.setCode(0);
+ model.setMsg("鏌ヨ澶辫触!");
+ }
+ return model;
+ }
+ //11.1FBS9100璁惧閫氫俊鐘舵�佹煡璇�<-------璺ㄥ煙----------->
+ public ServiceModel serchByCondition_ky(){
+ //FBS9100鏁版嵁
+ List list = ((Fbs9100_stateImpl)dao).serchByCondition_ky();
if(list!=null && list.size()>0){
model.setCode(1);
model.setData(list);
--
Gitblit v1.9.1