From b0433dbdf74457deed81b44767513baa55d4ae73 Mon Sep 17 00:00:00 2001
From: 星伟 <星伟@192.168.10.28>
Date: 星期二, 09 十月 2018 16:07:40 +0800
Subject: [PATCH] 包机组中4层筛选

---
 gx_tieta/src/com/fgkj/actions/BattInfAction.java |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/actions/BattInfAction.java b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
index 89b44ee..c0290e7 100644
--- a/gx_tieta/src/com/fgkj/actions/BattInfAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
@@ -258,12 +258,28 @@
 		result = ActionUtil.tojson(model);
 		return SUCCESS;
 	}
+	//鏌ヨ鎵�鏈夌殑鐪佷唤(宸︿晶瀵艰埅绗竴灞傦紝鏌ユ墍鏈夌殑鐪佷唤)
+	public String serchAllStation_all(){
+		User_inf u = (User_inf)getUser();
+		BattInf binf=new BattInf();
+		binf.setNum(u.getUId());
+		ServiceModel model = service.serchAllStation_all(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;
+	}
+	//鏌ヨ绠$悊鐨勫競(宸︿晶瀵艰埅绗簩灞傦紝鏌ユ墍鏈夌殑甯�)
+	public String serchStationName2_all(){
+		BattInf binf = ActionUtil.getGson().fromJson(json, BattInf.class);
+		ServiceModel model = service.serchStationName2_all(binf);
 		result = ActionUtil.tojson(model);
 		return SUCCESS;
 	}
@@ -276,6 +292,13 @@
 		result = ActionUtil.tojson(model);
 		return SUCCESS;
 	}
+	//鏌ヨ绠$悊鐨勬満鎴�(宸︿晶瀵艰埅绗笁灞傦紝鏌ユ墍鏈夌殑鏈烘埧)
+	public String serchStationName3_all(){
+		BattInf binf = ActionUtil.getGson().fromJson(json, BattInf.class);
+		ServiceModel model = service.serchStationName3_all(binf);
+		result = ActionUtil.tojson(model);
+		return SUCCESS;
+	}
 	//鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�(宸︿晶瀵艰埅绗洓灞�,鏍规嵁鏈烘埧鏌ヨ涓嬮潰鐨勭數姹犵粍,num涓瓨鏀緐id)
 	public String serchBattByStation(){
 		BattInf binf = ActionUtil.getGson().fromJson(json, BattInf.class);
@@ -286,6 +309,14 @@
 		result = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").toJson(model);
 		return SUCCESS;
 	}
+	//鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�(宸︿晶瀵艰埅绗洓灞�,鏍规嵁鏈烘埧鏌ヨ涓嬮潰鐨勭數姹犵粍)
+	public String serchBattByStation_all(){
+		BattInf binf = ActionUtil.getGson().fromJson(json, BattInf.class);
+		//System.out.println(binf);
+		ServiceModel model = service.serchBattByStation_all(binf);
+		result = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").toJson(model);
+		return SUCCESS;
+	}
 	
 	//鏌ヨ鎵�鏈夌殑鐢垫睜缁勬暟
 	public String serchAllBatt(){

--
Gitblit v1.9.1