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/Batt_enduranceAction.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/Batt_enduranceAction.java b/gx_tieta/src/com/fgkj/actions/Batt_enduranceAction.java
index 2ac9952..8afc13e 100644
--- a/gx_tieta/src/com/fgkj/actions/Batt_enduranceAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Batt_enduranceAction.java
@@ -2,6 +2,7 @@
import com.fgkj.dto.Batt_endurance;
import com.fgkj.dto.ServiceModel;
+import com.fgkj.dto.User_inf;
import com.fgkj.services.Batt_enduranceService;
public class Batt_enduranceAction extends ActionUtil{
@@ -12,13 +13,27 @@
//缁埅鏃堕棿鐨勬煡璇�
public String serchByCondition() {
Batt_endurance bendurance=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Batt_endurance.class);
+ User_inf uinf=(User_inf) getUser();
+ bendurance.setNum(uinf.getUId());
ServiceModel model=service.serchByCondition(bendurance);
result=tojson(model);
return SUCCESS;
}
-
+ //缁埅涓嶈冻1灏忔椂锛�2灏忔椂绛夌殑楗肩姸鍥�
+ public String serchByState_xuhang() {
+ User_inf uinf=(User_inf) getUser();
+ ServiceModel model=service.serchByState_xuhang(uinf);
+ result=tojson(model);
+ return SUCCESS;
+ }
-
+ //瀵艰埅涓婄画鑸笉瓒�3灏忔椂鐨勪釜鏁�
+ public String serchxuhangNotInThree() {
+ User_inf uinf=(User_inf) getUser();
+ ServiceModel model=service.serchxuhangNotInThree(uinf);
+ result=tojson(model);
+ return SUCCESS;
+ }
public String getResult() {
return result;
--
Gitblit v1.9.1