From a86aed1d459024ab2a97d98115ef57f8dce808e6 Mon Sep 17 00:00:00 2001
From: admin:huo123456@qq <496960745@qq.com>
Date: 星期一, 21 一月 2019 09:15:44 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/ram/Fbs9100_setparamAction.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_setparamAction.java b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_setparamAction.java
index e9efda0..1fe7059 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_setparamAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_setparamAction.java
@@ -19,6 +19,7 @@
private Fbs9100_setparamService service = new Fbs9100_setparamService();
private User_logService uservice=new User_logService();
private String json;
+ private String json_msg;
private String result;
//鏍规嵁鏈烘埧缂栧彿鍜岀淮鎶ゅ尯鏌ヨ鏀剧數鏈烘埧鐨勪俊鎭拰鏀剧數鍙傛暟
@@ -52,8 +53,24 @@
//鎵归噺璁剧疆鏀剧數鍙傛暟
public String updatePro() {
List<Fbs9100_setparam> list=getGson().fromJson(json, new TypeToken<List<Fbs9100_setparam>>(){}.getType());
- Fbs9100_setparam fbs = getGson().fromJson(json, Fbs9100_setparam.class);
ServiceModel model = service.updatePro(list);
+ {
+ String msg="鎵归噺璁剧疆"+json_msg+"鐨勬斁鐢靛弬鏁�";
+ User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Batch, msg);
+ uservice.add(ulog);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
+ }
+ result = tojson(model);
+ return SUCCESS;
+ }
+ //鎵归噺鏀剧數
+ public String updatePro_dis() {
+ List<Fbs9100_setparam> list=getGson().fromJson(json, new TypeToken<List<Fbs9100_setparam>>(){}.getType());
+ ServiceModel model = service.updatePro_dis(list);
+ {
+ String msg="鎵归噺鍚姩"+json_msg+"鐨勬斁鐢�";
+ User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Batch, msg);
+ uservice.add(ulog);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
+ }
result = tojson(model);
return SUCCESS;
}
@@ -142,5 +159,9 @@
public void setJson(String json) {
this.json = json;
}
+
+ public void setJson_msg(String json_msg) {
+ this.json_msg = json_msg;
+ }
}
--
Gitblit v1.9.1