From be1267c82755ea2217e3e84d6b47661eaf075497 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期二, 25 九月 2018 16:04:15 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/BattInfAction.java | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/BattInfAction.java b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
index e1558df..303fa16 100644
--- a/gx_tieta/src/com/fgkj/actions/BattInfAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
@@ -243,13 +243,7 @@
return SUCCESS;
}
- //鏌ヨ鎵�鏈夌殑鏈烘埧
- public String serchAllStation(){
- User_inf u = (User_inf)getUser();
- ServiceModel model = service.serchAllStation(u);
- result = ActionUtil.tojson(model);
- return SUCCESS;
- }
+
//鎼滅储鏈烘埧鎴栫數姹犵粍
public String serchStationOrBattgroup(){
@@ -258,9 +252,39 @@
result = ActionUtil.tojson(model);
return SUCCESS;
}
- //鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�
+ //鏌ヨ鎵�鏈夌殑鐪佷唤(宸︿晶瀵艰埅绗竴灞傦紝鏌ユ墍鏈夌殑鐪佷唤,num涓瓨鏀緐id)
+ public String serchAllStation(){
+ User_inf u = (User_inf)getUser();
+ BattInf binf=new BattInf();
+ binf.setNum(u.getUId());
+ ServiceModel model = service.serchAllStation(binf);
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
+ //鏌ヨ绠＄悊鐨勫競(宸︿晶瀵艰埅绗簩灞傦紝鏌ユ墍鏈夌殑甯�,num涓瓨鏀緐id)
+ public String serchStationName2(){
+ User_inf u = (User_inf)getUser();
+ BattInf binf = ActionUtil.getGson().fromJson(json, BattInf.class);
+ binf.setNum(u.getUId());
+ ServiceModel model = service.serchStationName2(binf);
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
+ //鏌ヨ绠＄悊鐨勬満鎴�(宸︿晶瀵艰埅绗笁灞傦紝鏌ユ墍鏈夌殑鏈烘埧,num涓瓨鏀緐id)
+ public String serchStationName3(){
+ User_inf u = (User_inf)getUser();
+ BattInf binf = ActionUtil.getGson().fromJson(json, BattInf.class);
+ binf.setNum(u.getUId());
+ ServiceModel model = service.serchStationName3(binf);
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
+ //鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�(宸︿晶瀵艰埅绗洓灞�,鏍规嵁鏈烘埧鏌ヨ涓嬮潰鐨勭數姹犵粍,num涓瓨鏀緐id)
public String serchBattByStation(){
BattInf binf = ActionUtil.getGson().fromJson(json, BattInf.class);
+ User_inf u = (User_inf)getUser();
+ binf.setNum(u.getUId());
+ //System.out.println(binf);
ServiceModel model = service.serchBattByStation(binf);
result = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").toJson(model);
return SUCCESS;
--
Gitblit v1.9.1