From a50eeca38aac03ba7a4fb9f27f73133936b8597a Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 05 十二月 2018 17:38:10 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java b/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java
index 902fcfd..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);
--
Gitblit v1.9.1