From ab25922c19981835d2fefb54e7d4e53e34f14529 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.24>
Date: 星期二, 13 十一月 2018 10:16:36 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/BattInfAction.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/BattInfAction.java b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
index 40b145a..c7c9cd6 100644
--- a/gx_tieta/src/com/fgkj/actions/BattInfAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
@@ -367,6 +367,14 @@
result = ActionUtil.tojson(model);
return SUCCESS;
}
+ //棣栭〉涓婃牴鎹畇tationid鏌ヨ鐢垫睜缁勭殑鏈哄巻鍗�
+ public String serchBattAllInfoByStationId(){
+ BattInf binf=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);
+ ServiceModel model = service.serchBattAllInfoByStationId(binf);
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
+
public BattInf getBif() {
return bif;
}
--
Gitblit v1.9.1