From 9ddc2aee31b9afc21659b378932a0f46f43071c2 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.24>
Date: 星期日, 30 九月 2018 11:50:57 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/BattInfAction.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/BattInfAction.java b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
index 303fa16..89b44ee 100644
--- a/gx_tieta/src/com/fgkj/actions/BattInfAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
@@ -242,9 +242,6 @@
result = ActionUtil.tojson(model);
return SUCCESS;
}
-
-
-
//鎼滅储鏈烘埧鎴栫數姹犵粍
public String serchStationOrBattgroup(){
BattInf binf = ActionUtil.getGson().fromJson(json, BattInf.class);
@@ -298,6 +295,13 @@
return SUCCESS;
}
+ //鐢垫睜閰嶇粍绠＄悊(閲嶈)
+ public String serchMakeGroup(){
+ BattInf binf=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);
+ ServiceModel model = service.serchMakeGroup(binf);
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
public BattInf getBif() {
return bif;
}
@@ -331,12 +335,6 @@
this.btdif = btdif;
}
-
-
-// public ServiceModel getModel() {
-// return model;
-// }
-
public void setJson(String json) {
this.json = json;
--
Gitblit v1.9.1