From f6bfafc3a6cd50f11fbf498ecf21498bd9112ff4 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期二, 08 一月 2019 17:37:51 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java
index 8aaa584..f18aca6 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java
@@ -5,6 +5,7 @@
import com.fgkj.actions.ActionUtil;
import com.fgkj.dao.FBS9100_ComBase;
import com.fgkj.dao.UinfDaoFactory;
+import com.fgkj.dto.BattInf;
import com.fgkj.dto.ServiceModel;
import com.fgkj.dto.User_log;
import com.fgkj.dto.ram.Fbs9100_battparam;
@@ -51,8 +52,21 @@
result = tojson(model);
return SUCCESS;
}
+ //鎵归噺璁剧疆鐢垫睜鍙傛暟鏃讹紝鏍规嵁鐪佸競鍖猴紝鐢垫睜鍗曚綋鍨嬪彿锛堜紡鏁帮級锛岀粍鏁扮瓫閫夊嚭鐢垫睜缁勫苟璇诲彇瀹冪殑瀹為檯鐢垫睜鍙傛暟
+ public String serchBattinfAndParam() {
+ BattInf binf=getGson().fromJson(json, BattInf.class);
+ ServiceModel model = service.serchBattinfAndParam(binf);
+ result = tojson(model);
+ return SUCCESS;
+ }
-
+ //鎵归噺璇诲彇鐢垫睜鍙傛暟
+ public String readPL() {
+ List<Fbs9100_battparam> list=getGson().fromJson(json, new TypeToken<List<Fbs9100_battparam>>(){}.getType());
+ ServiceModel model = service.readPL(list);
+ result = tojson(model);
+ return SUCCESS;
+ }
--
Gitblit v1.9.1