From 5c6c1cbfb073ba802569f91e9894606d5a0d4893 Mon Sep 17 00:00:00 2001 From: calyrex <2213354201@qq.com> Date: Tue, 24 Dec 2024 16:57:27 +0800 Subject: [PATCH] BillFieldUtil updates --- .../weaver/seconddev/interfaces/htjt/util/TransUtil.java | 8 +++++++- .../interfaces/workflow/action/SendPostRequest_PO.java | 8 ++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/TransUtil.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/TransUtil.java index 1edff52..151789e 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/TransUtil.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/TransUtil.java @@ -46,7 +46,13 @@ public class TransUtil { if ("".equals(selectvalue)) { return selectname; } - String sql = "select c.selectname from form_field a, form b,workflow_selectitem c where a.form_id=b.id and c.fieldid=a.id and b.tablename='" + tableName + "' and a.fieldname='" + filedname + "' and c.selectvalue='" + selectvalue + "'"; + String sql = "SELECT c.value_key AS selectvalue\n" + + "FROM e10_core_business.dbo.form_field a, e10_core_business.dbo.form b, field_option c\n" + + "WHERE a.form_id = b.id\n" + + "\tAND c.field_id = a.id\n" + + "\tAND b.tablename = '" + tableName + "'\n" + + "\tAND a.data_key = '" + filedname + "'\n" + + "\tAND c.name = '" + selectname + "'"; logger_24a1e280.info("TransUtil sql "+sql); String poolname_oj = CONN_TYPE.workflow.getType(); /* writeLog("sql:"+sql); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SendPostRequest_PO.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SendPostRequest_PO.java index e7acdf3..fe56fac 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SendPostRequest_PO.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SendPostRequest_PO.java @@ -29,13 +29,15 @@ public class SendPostRequest_PO extends BaseBean { try { HttpClient client = new DefaultHttpClient(); post = new HttpPost(url); + logger_8469796.info("post--" + post); post.setHeader(HTTP.CONTENT_TYPE, "application/json; charset=UTF-8"); post.setHeader("Accept", "application/json; charset=UTF-8"); // post.setHeader("appkey",); // po需要的验证 + // TODO config costom config无法获取密码 // post.setHeader("Authorization", Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.url_password")).trim()); - logger_8469796.info("getUrl_password--" + configProp.getUrl_password()); - post.setHeader("Authorization", configProp.getUrl_password()); +// logger_8469796.info("getUrl_password--" + configProp.getUrl_password()); + post.setHeader("Authorization", "Basic UE9VU0VSOjY1NDMyMQ=="); StringEntity entity = new StringEntity(returnJson.toString(), "UTF-8"); post.setEntity(entity); @@ -54,4 +56,6 @@ public class SendPostRequest_PO extends BaseBean { } return result; } + + }