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/ram/Fbs9100_stateAction.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java
index e7e632c..081c8ba 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java
@@ -2,6 +2,8 @@
import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
import com.fgkj.actions.ActionUtil;
import com.fgkj.dto.BattInf;
import com.fgkj.dto.ServiceModel;
@@ -93,13 +95,31 @@
result = tojson(model);
return SUCCESS;
}
- //瀵艰埅涓婂疄鏃舵煡璇�61850璁惧鐨勫浜庢牳瀹规祴璇曠殑鏁版嵁
+ //瀵艰埅涓婂疄鏃舵煡璇�61850璁惧鐨勫浜庢牳瀹规祴璇曠殑鏁版嵁
public String seach6185Nuclear_cap(){
User_inf uinf=(User_inf) getUser();
ServiceModel model = service.seach6185Nuclear_cap(uinf);
result = tojson(model);
return SUCCESS;
}
+ //瀵艰埅涓婂疄鏃舵煡璇ts澶勪簬鏀剧數娴嬭瘯鐨勬暟鎹殑璁惧
+ public String seachNuclear_cap(){
+ User_inf uinf=(User_inf) getUser();
+ ServiceModel model = service.seachNuclear_cap(uinf);
+ result = tojson(model);
+ return SUCCESS;
+ }
+
+ //11.1FBS9100璁惧閫氫俊鐘舵�佹煡璇� <-- 璺ㄥ煙 -->
+ public String serchByCondition_ky(){
+ //isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
+ ServiceModel model = new ServiceModel();
+ model = service.serchByCondition_ky();
+ result = tojson(model);
+ return SUCCESS;
+ }
+
+
public String getResult() {
return result;
}
--
Gitblit v1.9.1