diff --git a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/common/utils/BaseAction.java b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/common/utils/BaseAction.java index 82a8f386..b3d72a1b 100644 --- a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/common/utils/BaseAction.java +++ b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/common/utils/BaseAction.java @@ -1,5 +1,6 @@ package com.murong.ecp.netpay.mbu.web.common.utils; +import com.murong.ecp.bp.common.util.MrSpringContextHolder; import com.yuangou.ecp.biz.transengine.AbstractTransaction; import com.yuangou.ecp.biz.transengine.YGTransEngine; import com.yuangou.ecp.biz.transengine.sqlsession.YGPageEntity; @@ -32,7 +33,7 @@ public abstract class BaseAction extends AbstractTransaction { YGEDB root = msg.getEDBBody(); Logger msgLog = YGLogger.getLogger(msg); - Object bean = YGTransEngine.getSpringBean(bizCtx, txnCod); + Object bean = MrSpringContextHolder.getBean(txnCod); String methodName = root.getData("_action"); if( methodName == null ) { methodName = "process"; diff --git a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/common/utils/PageRequest.java b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/common/utils/PageRequest.java index 70f90010..2d710ccc 100644 --- a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/common/utils/PageRequest.java +++ b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/common/utils/PageRequest.java @@ -16,7 +16,7 @@ public class PageRequest { * 开始记录号 */ @NotNull(message="offset必须输入") - private Integer offset = null; + private Integer offset = Integer.valueOf(0); /** * 每页记录数 diff --git a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/plt/action/pltadmbpc1/PubTmsAction.java b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/plt/action/pltadmbpc1/PubTmsAction.java index c7c1fee4..9487f5c9 100644 --- a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/plt/action/pltadmbpc1/PubTmsAction.java +++ b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/plt/action/pltadmbpc1/PubTmsAction.java @@ -157,6 +157,9 @@ public class PubTmsAction extends BaseAction { YGBizMessage bizMsg = bizCtx.getCurrentMsg(); Logger msgLog = YGLogger.getLogger(bizMsg); YGEDB root = bizMsg.getEDBBody(); + if(reqBO.getOffset() == null ) { + reqBO.setOffset(0); + } msgLog.info("list, reqBO=" + JSONObject.toJSON(reqBO)); ValidatorUtil.validateObject(reqBO); diff --git a/ecp-mbu-web/src/main/webapp/WEB-INF/conf/action_config.xml b/ecp-mbu-web/src/main/webapp/WEB-INF/conf/action_config.xml index 721889bf..8dea07e4 100644 --- a/ecp-mbu-web/src/main/webapp/WEB-INF/conf/action_config.xml +++ b/ecp-mbu-web/src/main/webapp/WEB-INF/conf/action_config.xml @@ -136,7 +136,7 @@ - + diff --git a/ecp-mbu-web/src/main/webapp/js/pub.js b/ecp-mbu-web/src/main/webapp/js/pub.js index cd795241..f43264c5 100644 --- a/ecp-mbu-web/src/main/webapp/js/pub.js +++ b/ecp-mbu-web/src/main/webapp/js/pub.js @@ -710,3 +710,328 @@ function ulInitData0(ul_id){ }); } + +var bui_util = (function () { + var amtFormat = function (num) { + if (!num) { + return "0.00"; + } + // 金额格式化 + num = num.toString().replace(/\$|\,/g, ''); + if (isNaN(num)) + num = "0"; + sign = (num == (num = Math.abs(num))); +// num = Math.floor(num*100+0.50000000001); + num = Math.floor(num * 100); + cents = num % 100; + num = Math.floor(num / 100).toString(); + if (cents < 10) + cents = "0" + cents; + for (var i = 0; i < Math.floor((num.length - (1 + i)) / 3); i++) + num = num.substring(0, num.length - (4 * i + 3)) + ',' + + num.substring(num.length - (4 * i + 3)); + return (((sign) ? '' : '-') + num + '.' + cents); + }; + + var amtProc = function (val) { + // 金额处理,删除千分位 + if (val) { + return val; + } + return val.replace(/\,/g, ''); + }; + + var dateProc = function (val) { + // 日期处理,删除- + if (!val) { + return val; + } + return val.replace(/\/|\-/g, ''); + }; + + var timeProc = function (val) { + // 时间处理,删除: + if (!val) { + return val; + } + return val.replace(/\:/g, ''); + }; + + var timestampProc = function (val) { + // 时间戳处理,删除-: + if (!val) { + return val; + } + return val.replace(/\-|\:/g, ''); + }; + + var timeFormat = function (val) { + // 时间格式化 + if (!val || val.length < 6) { + return val; + } + return val.substr(0, 2) + ":" + val.substr(2, 2) + ":" + val.substr(4, 2); + }; + + var dateFormat = function (val) { + // 日期格式化 + if (!val || val.length < 8) { + return val; + } + return val.substr(0, 4) + "-" + val.substr(4, 2) + "-" + val.substr(6, 2); + }; + + var timestampFormat = function (val) { + // 时间戳格式化 + if (!val || val.length < 14) { + return val; + } + return val.substr(0, 4) + "-" + val.substr(4, 2) + "-" + val.substr(6, 2) + " " + val.substr(8, 2) + ":" + val.substr(10, 2) + ":" + val.substr(12, 2); + }; + + var dateFormatter = function (value, row, index) { + return dateFormat(value); + }; + + var timeFormatter = function (value, row, index) { + return timeFormat(value); + }; + + var timestampFormatter = function (value, row, index) { + return timestampFormat(value); + }; + + var amtFormatter = function (value, row, index) { + return amtFormat(value); + }; + + + var getNowDate = function(dateFlg) { + // 获取字符日期 + var myDate = new Date(); + var m = (myDate.getMonth() + 1) < 10 ? ("0" + (myDate.getMonth() + 1)) : (myDate.getMonth() + 1); + var d = myDate.getDate() < 10 ? ("0" + myDate.getDate()) : myDate.getDate(); + if (dateFlg == 0) { + return "" + myDate.getFullYear() + m + d; + } else if (dateFlg == 1) { + return myDate.getFullYear() + "-" + m + "-" + d; + } + }; + + var getFieldHelp = function (elementId, tableName, keyColumn, valueColumn, condition) { + // 根据表名动态获取select下拉框内容 + // elementId select元素id + // tableName 表名 + // keyColumn key名称 + // valueColumn value名称 + // condition 查询条件 + var params = { + table_name:tableName, + key_column:keyColumn, + value_column:valueColumn, + condition:condition + }; + + syncCallTxn("pltadmbpc1", "pubFieldHlpByTableName", params, function (data) { + var options = ""; + $.each(data.rec, function (k, c) { + var option = ""; + options += option; + }); + $("#" + elementId).empty(); + $("#" + elementId).append(options); + }); + }; + + var getFieldHelpBySqlId = function (elementId, sqlId, params) { + // 根据表名动态获取select下拉框内容 + // elementId select元素id + // sqlId sql名称 + // params 参数 + var params1 = { + sql_id:sqlId + } + params1 = $.extend({}, params1, params); + + var url = "/mbu/pltadmbpc1/pubFieldHlpBySqlId.do"; + $.ajax({ + type: "GET", + url: url, + data: params1, + dataType: "json", + async: false, + error: function (request) { + Messenger().post("调用url:[" + url + "]失败, " + request); + }, + success: function (data) { + var msgcd = data.gda.msg_cd; + $("#" + elementId).empty(); + if(!isTxnSucc(msgcd)) { + console.log("调用url:[" + url + "]错误, " + data.gda.msg_cd + ":" + data.gda.msg_inf); + return; + } + var options = ""; + $.each(data.rec, function (k, c) { + var option = ""; + options += option; + }); + $("#" + elementId).append(options); + } + }); + + }; + + var isTxnSucc = function(msgCod) { + if(!msgCod || msgCod.length < 8 ) { + return false; + } + return msgCod.substring(3) == "00000"; + }; + + var syncCallTxn = function (serverName, txnCod, params, sucessFunc) { + // 同步调用交易处理 + // serverName 服务名(必须) + // txnCod 交易码(必须) + // params 参数(可输) + // sucessFunc 成功处理函数(可输) + var resultData; + $.ajax({ + type: "GET", + url: "/mbu/" + serverName + "/" + txnCod + ".do", + data: params, + dataType: "json", + async: false, + error: function (request) { + Messenger().post("调用交易:[" + serverName + "." + txnCod + "]失败, " + request); + }, + success: function (data) { + resultData = data; + var msgcd = data.gda.msg_cd; + if(!isTxnSucc(msgcd)) { + Messenger().post("调用交易:[" + serverName + "." + txnCod + "]错误, " + data.gda.msg_cd + ":" + data.gda.msg_inf); + return; + } + if( sucessFunc ) { + sucessFunc(data); + } + } + }); + return resultData; + }; + + var syncCallAction = function (serverName, txnCod, method, params, sucessFunc) { + // 同步调用action处理 + // serverName 服务名(必须) + // txnCod 交易码(必须) + // method 方法名(必须) + // params 参数(可输) + // sucessFunc 成功处理函数(可输) + var resultData; + $.ajax({ + type: "GET", + url: "/mbu/" + serverName + "/" + txnCod + ".do?_action=" + method, + data: params, + dataType: "json", + async: false, + error: function (request) { + Messenger().post("调用交易:[" + serverName + "." + txnCod + "]失败, " + request); + }, + success: function (data) { + resultData = data; + var msgcd = data.gda.msg_cd; + if(!isTxnSucc(msgcd)) { + Messenger().post("调用交易:[" + serverName + "." + txnCod + "]错误, " + data.gda.msg_cd + ":" + data.gda.msg_inf); + return; + } + if( sucessFunc ) { + sucessFunc(data); + } + } + }); + return resultData; + }; + + var asyncCallTxn = function (serverName,txnCod, params, sucessFunc) { + // 异步调用交易处理 + // serverName 服务名(必须) + // txnCod 交易码(必须) + // params 参数(可输) + // sucessFunc 成功处理函数(可输) + $.ajax({ + type: "GET", + url: "/mbu/" + serverName + "/" + txnCod + ".do", + data: params, + dataType: "json", + async: true, + error: function (request) { + Messenger().post("调用交易:[" + serverName + "." + txnCod + "]失败, " + request); + }, + success: function (data) { + var msgcd = data.gda.msg_cd; + if(!isTxnSucc(msgcd)) { + Messenger().post("调用交易:[" + serverName + "." + txnCod + "]错误, " + data.gda.msg_cd + ":" + data.gda.msg_inf); + return; + } + if( sucessFunc ) { + sucessFunc(data); + } + } + }); + }; + + var asyncCallAction = function (serverName,txnCod, method, params, sucessFunc) { + // 异步调用action处理 + // serverName 服务名(必须) + // txnCod 交易码(必须) + // method 方法名(必须) + // params 参数(可输) + // sucessFunc 成功处理函数(可输) + $.ajax({ + type: "GET", + url: "/mbu/" + serverName + "/" + txnCod + ".do?_action=" + method, + data: params, + dataType: "json", + async: true, + error: function (request) { + Messenger().post("调用交易:[" + serverName + "." + txnCod + "]失败, " + request); + }, + success: function (data) { + var msgcd = data.gda.msg_cd; + if(!isTxnSucc(msgcd)) { + Messenger().post("调用交易:[" + serverName + "." + txnCod + "]错误, " + data.gda.msg_cd + ":" + data.gda.msg_inf); + return; + } + if( sucessFunc ) { + sucessFunc(data); + } + } + }); + }; + + + return { + amtFormat: amtFormat, + amtProc: amtProc, + amtFormatter: amtFormatter, + dateProc: dateProc, + timeProc: timeProc, + timestampProc: timestampProc, + timestampFormat: timestampFormat, + timeFormat: timeFormat, + dateFormat: dateFormat, + timeFormatter: timeFormatter, + dateFormatter: dateFormatter, + timestampFormatter: timestampFormatter, + getFieldHelp: getFieldHelp, + asyncCallTxn:asyncCallTxn, + syncCallTxn:syncCallTxn, + syncCallAction:syncCallAction, + asyncCallAction:asyncCallAction, + isTxnSucc:isTxnSucc, + getFieldHelpBySqlId:getFieldHelpBySqlId + }; +})(); + + diff --git a/ecp-mbu-web/src/main/webapp/pages/plt/pub_tms_mng.html b/ecp-mbu-web/src/main/webapp/pages/plt/pub_tms_mng.html index e0b76047..ec250b18 100644 --- a/ecp-mbu-web/src/main/webapp/pages/plt/pub_tms_mng.html +++ b/ecp-mbu-web/src/main/webapp/pages/plt/pub_tms_mng.html @@ -111,7 +111,7 @@ - +
-
+
@@ -97,7 +97,7 @@
<#if column.attr.dictType == "date"> - ${column.name1} : bui_util.dateProc($("#query_${column.name1}").attr("value")) <#sep>, + ${column.name1} : bui_util.dateProc($("#query_${column.name1}").val()) <#sep>, <#elseif column.attr.dictType == "time"> - ${column.name1} : bui_util.timeProc($("#query_${column.name1}").attr("value")) <#sep>, + ${column.name1} : bui_util.timeProc($("#query_${column.name1}").val()) <#sep>, <#elseif column.attr.dictType == "timestamp"> - ${column.name1} : bui_util.timestampProc($("#query_${column.name1}").attr("value")) <#sep>, + ${column.name1} : bui_util.timestampProc($("#query_${column.name1}").val()) <#sep>, <#elseif column.attr.dictType == "amt1"> - ${column.name1} : bui_util.amtProc($("#lquery_${column.name1}").attr("value")) <#sep>, + ${column.name1} : bui_util.amtProc($("#lquery_${column.name1}").val()) <#sep>, <#else> - ${column.name1} : $("#query_${column.name1}").attr("value") <#sep>, + ${column.name1} : $("#query_${column.name1}").val() <#sep>, @@ -296,6 +297,7 @@ function queryParams(params) { var params = { + _action:'list', }; return params; } @@ -328,17 +330,18 @@ } // 日期特殊处理 var params = { + _action:'add', <#list addColumns as column> <#if column.attr.dictType == "date"> - ${column.name1}: bui_util.dateProc($("#${column.name1}").attr("value"))<#sep>, + ${column.name1}: bui_util.dateProc($("#${column.name1}").val())<#sep>, <#elseif column.attr.dictType == "time"> - ${column.name1}: bui_util.timeProc($("#${column.name1}").attr("value"))<#sep>, + ${column.name1}: bui_util.timeProc($("#${column.name1}").val())<#sep>, <#elseif column.attr.dictType == "timestamp"> - ${column.name1}: bui_util.timestampProc($("#${column.name1}").attr("value"))<#sep>, + ${column.name1}: bui_util.timestampProc($("#${column.name1}").val())<#sep>, <#elseif column.attr.dictType == "amt1"> - ${column.name1}: bui_util.amtProc($("#${column.name1}").attr("value"))<#sep>, + ${column.name1}: bui_util.amtProc($("#${column.name1}").val())<#sep>, <#else> - ${column.name1}: $("#${column.name1}").attr("value")<#sep>, + ${column.name1}: $("#${column.name1}").val()<#sep>, @@ -348,7 +351,7 @@ type: "POST", url: "${add_url}", contentType: "application/json", - data: params, + data: JSON.stringify(params), dataType: "json", async: false, error: function (request) { @@ -399,17 +402,18 @@ // 日期特殊处理 var params = { + _action:'update', <#list addColumns as column> <#if column.attr.dictType == "date"> - ${column.name1}: bui_util.dateProc($("#${column.name1}").attr("value"))<#sep>, + ${column.name1}: bui_util.dateProc($("#${column.name1}").val())<#sep>, <#elseif column.attr.dictType == "time"> - ${column.name1}: bui_util.timeProc($("#${column.name1}").attr("value"))<#sep>, + ${column.name1}: bui_util.timeProc($("#${column.name1}").val())<#sep>, <#elseif column.attr.dictType == "timestamp"> - ${column.name1}: bui_util.timestampProc($("#${column.name1}").attr("value"))<#sep>, + ${column.name1}: bui_util.timestampProc($("#${column.name1}").val())<#sep>, <#elseif column.attr.dictType == "amt1"> - ${column.name1}: bui_util.amtProc($("#${column.name1}").attr("value"))<#sep>, + ${column.name1}: bui_util.amtProc($("#${column.name1}").val())<#sep>, <#else> - ${column.name1}: $("#${column.name1}").attr("value")<#sep>, + ${column.name1}: $("#${column.name1}").val()<#sep>, }; @@ -417,7 +421,7 @@ $.ajax({ type: "POST", url: "${update_url}", - data: params, + data: JSON.stringify(params), dataType: "json", contentType: "application/json", async: false, @@ -458,6 +462,7 @@ } var row = rows[0]; var params = { + _action:'delete', <#list primaryColumns as column > ${column.name1} : row.${column.name1} <#sep>, @@ -467,7 +472,7 @@ $.ajax({ type: "POST", url: "${delete_url}", - data: params, + data: JSON.stringify(params), dataType: "json", contentType: "application/json", async: false, @@ -520,15 +525,15 @@ <#list updateColumns as column> <#if column.attr.dictType == "date"> - $("#${column.name1}").attr("value", bui_util.dateFormat(row.${column.name1})); + $("#${column.name1}").val(bui_util.dateFormat(row.${column.name1})); <#elseif column.attr.dictType == "time"> - $("#${column.name1}").attr("value", bui_util.timeFormat(row.${column.name1})); + $("#${column.name1}").val(bui_util.timeFormat(row.${column.name1})); <#elseif column.attr.dictType == "timestamp"> - $("#${column.name1}").attr("value", bui_util.timestampFormat(row.${column.name1})); + $("#${column.name1}").val(bui_util.timestampFormat(row.${column.name1})); <#elseif column.attr.dictType == "amt1"> - $("#${column.name1}").attr("value", bui_util.amtFormat(row.${column.name1})); + $("#${column.name1}").val(bui_util.amtFormat(row.${column.name1})); <#else> - $("#${column.name1}").attr("value", row.${column.name1}); + $("#${column.name1}").val(row.${column.name1}); }