From a6d6b1f0b7cc05e3be11b9c456d0da7f81c799dc Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.20>
Date: 星期四, 29 十一月 2018 10:37:41 +0800
Subject: [PATCH] 修改升级
---
gx_tieta/src/com/fgkj/services/Battalarm_dataService.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java b/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
index fdf7cda..089c074 100644
--- a/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
+++ b/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
@@ -225,9 +225,8 @@
}
- //0.5鏌ヨ瀹炴椂鍛婅鏁�
+ //0.5鏌ヨ瀹炴椂鍛婅鏁�(鐢垫睜鍛婅鐜�)
public ServiceModel serchAlm(Object obj){
- Batt_Maint_Dealarm bmd=(Batt_Maint_Dealarm) obj;
Battalarm_data adata=new Battalarm_data();
adata.setNum(0);//瀹炴椂鍛婅鎬绘暟
adata.setBattGroupId(0);//瀹归噺鍛婅鍛婅鏁�
@@ -240,10 +239,9 @@
adata.setUsr_Id(0);//杩炴帴鏉￠樆鎶楀憡璀︽暟
adata.setAlm_value(0f);//瀹归噺鏇存崲鍛婅
adata.setRecord_Id(0l);//鍦ㄧ嚎鐢靛帇鍛婅鏁�
- bmd.setAdata(adata);
int numZ=0;//鍛婅鎬绘暟
//姹傚叓绉嶇被鍨嬪憡璀︾殑鏁伴噺
- List<Battalarm_data> list=((Battalarm_dataDAOImpl)dao).serchAlm(bmd);
+ List<Battalarm_data> list=((Battalarm_dataDAOImpl)dao).serchAlm(obj);
if(list!=null&&list.size()>0){
for(int i=0;i<list.size();i++){
if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_CapAlarm){
@@ -291,7 +289,7 @@
adata.setNum(numZ);//瀹炴椂鍛婅鎬绘暟
model.setCode(1);
model.setData(adata);
- System.out.println(model.getData());
+ //System.out.println(model.getData());
return model;
}
@@ -582,7 +580,7 @@
//System.out.println(bmd);
//bs.serchByCondition(bmd);
//bs.serchByInfo(bmd);
- bs.serchAlm(bmd);
+ bs.serchAlm(uinf);
//bs.serchGood();
//bs.serchTopAlmTen(uinf);
}
--
Gitblit v1.9.1