From 512733908ae4f3a851f40f0551724d2186ce56ec Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.26>
Date: 星期四, 13 十二月 2018 11:20:11 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java b/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java
index 30619c4..48d6397 100644
--- a/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java
@@ -5,6 +5,7 @@
import com.fgkj.dao.impl.BattInfImpl;
import com.fgkj.dao.impl.Battalarm_dataDAOImpl;
+import com.fgkj.dto.BattInf;
import com.fgkj.dto.Batt_Maint_Dealarm;
import com.fgkj.dto.Battalarm_data;
import com.fgkj.dto.RoleLimit;
@@ -31,7 +32,13 @@
result=ActionUtil.tojson(model);
return SUCCESS;
}
-
+ //3.1鐢垫睜鍛婅瀹炴椂鏌ヨ<***********璺ㄥ煙涓撶敤**************>
+ public String serchByCondition_ky(){
+ BattInf binf=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);
+ ServiceModel model=service.serchByCondition_ky(binf);
+ result=ActionUtil.tojson(model);
+ return SUCCESS;
+ }
//3.2鐢垫睜鍛婅鍘嗗彶璁板綍鏌ヨ
public String serchByInfo(){
bmd = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(result, Batt_Maint_Dealarm.class);
@@ -45,8 +52,7 @@
//0.5鏌ヨ瀹炴椂鍛婅鏁�(鐢垫睜鍛婅鐜�)
public String serchAlm(){
User_inf uinf=(User_inf) ActionUtil.getUser();
- bmd.setUinf(uinf);
- ServiceModel model=service.serchAlm(bmd);
+ ServiceModel model=service.serchAlm(uinf);
result=ActionUtil.tojson(model);
return SUCCESS;
}
--
Gitblit v1.9.1