From 18cf7a6b456cb0f401c48ad16b12de1877541558 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.10>
Date: 星期一, 22 十月 2018 09:50:34 +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/BattMap_informationAction.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/BattMap_informationAction.java b/gx_tieta/src/com/fgkj/actions/BattMap_informationAction.java
index d6a8f2d..7ea5587 100644
--- a/gx_tieta/src/com/fgkj/actions/BattMap_informationAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BattMap_informationAction.java
@@ -4,6 +4,7 @@
import com.fgkj.dao.UinfDaoFactory;
import com.fgkj.dto.BattMap_information;
+import com.fgkj.dto.Page;
import com.fgkj.dto.ServiceModel;
import com.fgkj.dto.User_inf;
import com.fgkj.dto.User_log;
@@ -98,14 +99,31 @@
result = tojson(model);
return SUCCESS;
}
- //9.1棣栭〉涓婃煡璇㈠凡缁忔坊鍔犵墿鐞嗕俊鎭殑鏈烘埧(鐢ㄦ埛绠＄悊鐨�) 鍖呮嫭(鍛婅鎬绘暟钀藉悗鎬绘暟寤惰繜鎬绘暟)
+ //9.1棣栭〉涓婃煡璇㈠凡缁忔坊鍔犵墿鐞嗕俊鎭殑鏈烘埧(鐢ㄦ埛绠＄悊鐨�,l鏌ヨ鍏ㄩ儴鎵撳紑椤甸潰)
public String searchUserManageStation() {
User_inf uinf=(User_inf) getUser();
- List list = service.searchUserManageStation(uinf);
+ ServiceModel model = service.searchUserManageStation(uinf);
+ result = tojson(model);
+ return SUCCESS;
+ }
+ //9.1棣栭〉涓婃煡璇㈠凡缁忔坊鍔犵墿鐞嗕俊鎭殑鏈烘埧(鐢ㄦ埛绠＄悊鐨勶紝鍒嗛〉鍒锋柊)
+ public String searchUserManageStation2() {
+ Page p=getGson().fromJson(json, Page.class);
+ User_inf uinf=(User_inf) getUser();
+ p.setPageAll(uinf.getUId());
+ List list = service.searchUserManageStation2(p);
result = tojson(list);
return SUCCESS;
}
-
+ //9.1棣栭〉涓婃煡璇㈠凡缁忔坊鍔犵墿鐞嗕俊鎭殑鏈烘埧(鐢ㄦ埛绠＄悊鐨勶紝3.鏍规嵁鍏蜂綋id鏌ヨ鍛婅淇℃伅绛�)
+ public String searchUserManageStation3() {
+ BattMap_information binfor=getGson().fromJson(json, BattMap_information.class);
+ User_inf uinf=(User_inf) getUser();
+ binfor.setNum(uinf.getUId());
+ List list = service.searchUserManageStation3(binfor);
+ result = tojson(list);
+ return SUCCESS;
+ }
//9.1鐢垫睜瀵垮懡绠＄悊
public String serchByStationid(){
BattMap_information bmap = getGson().fromJson(json, BattMap_information.class);
--
Gitblit v1.9.1