From 04bc2d9b97c61ea79017d05f81053e719742f82f Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期三, 19 十二月 2018 15:41:01 +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/Battinf_applyAction.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java b/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java
index 8a36312..020f95d 100644
--- a/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java
@@ -4,6 +4,7 @@
import com.fgkj.dto.BattInf;
import com.fgkj.dto.Battinf_apply;
+import com.fgkj.dto.Page;
import com.fgkj.dto.ServiceModel;
import com.fgkj.dto.User_inf;
import com.fgkj.services.Battinf_applyService;
@@ -23,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() );
@@ -32,8 +47,8 @@
}
//鏌ヨ鍑烘墍鏈夐渶瑕佺‘璁ょ殑鐢宠
public String serchByCondition(){
- Battinf_apply bapply=ActionUtil.getGson().fromJson(json, Battinf_apply.class);
- ServiceModel model=service.serchByCondition(bapply);
+ Page page=ActionUtil.getGson().fromJson(json, Page.class);
+ ServiceModel model=service.serchByCondition(page);
result=tojson(model);
return SUCCESS;
}
@@ -46,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