From 512733908ae4f3a851f40f0551724d2186ce56ec Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.26>
Date: 星期四, 13 十二月 2018 11:20:11 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java b/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java
index eb9ba94..020f95d 100644
--- a/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java
@@ -24,6 +24,20 @@
result=tojson(model);
return SUCCESS;
}
+ //鐢宠浜哄啀鎴戠殑鐢宠椤甸潰鐨勪慨鏀规搷浣�
+ public String updatePro(){
+ List<Battinf_apply> list=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(json,new TypeToken<List<Battinf_apply>>(){}.getType() );
+ ServiceModel model=service.updatePro(list);
+ result=tojson(model);
+ return SUCCESS;
+ }
+ //鎴戠殑鐢宠涓彇娑堢敵璇峰鏉�
+ public String del(){
+ List<Battinf_apply> list=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(json,new TypeToken<List<Battinf_apply>>(){}.getType() );
+ ServiceModel model=service.del(list);
+ result=tojson(model);
+ return SUCCESS;
+ }
//娣诲姞鐢宠
public String add(){
List<Battinf_apply> list=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(json,new TypeToken<List<Battinf_apply>>(){}.getType() );
@@ -47,7 +61,15 @@
result=tojson(model);
return SUCCESS;
}
-
+ //鐢宠浜轰慨鏀瑰緟瀹℃牳鐨勭敵璇锋椂鐨勬煡璇�
+ public String serchbystationId(){
+ Battinf_apply bapply=ActionUtil.getGson().fromJson(json, Battinf_apply.class);
+ User_inf uinf=(User_inf) getUser();
+ bapply.setNum(uinf.getUId());
+ ServiceModel model=service.serchbystationId(bapply);
+ result=tojson(model);
+ return SUCCESS;
+ }
public String getResult() {
return result;
--
Gitblit v1.9.1