From 6f15ff9f459ac08777fbc01995238e3ac4a700b0 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 22 十月 2018 10:23:06 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/BattInfAction.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/BattInfAction.java b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
index c0290e7..512861a 100644
--- a/gx_tieta/src/com/fgkj/actions/BattInfAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
@@ -329,10 +329,21 @@
//鐢垫睜閰嶇粍绠＄悊(閲嶈)
public String serchMakeGroup(){
BattInf binf=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);
+ User_inf uinf=(User_inf) getUser();
+ binf.setNum(uinf.getUId());
ServiceModel model = service.serchMakeGroup(binf);
result = ActionUtil.tojson(model);
return SUCCESS;
}
+ //鐢垫睜閰嶇粍绠＄悊(閲嶈)
+ public String serchGroupByInfor(){
+ BattInf binf=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);
+ User_inf uinf=(User_inf) getUser();
+ binf.setNum(uinf.getUId());
+ ServiceModel model = service.serchGroupByInfor(binf);
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
public BattInf getBif() {
return bif;
}
--
Gitblit v1.9.1