diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/BillFieldUtil.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/BillFieldUtil.java index 0a8d1d5..b2e7c35 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/BillFieldUtil.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/BillFieldUtil.java @@ -36,6 +36,9 @@ public class BillFieldUtil { // TODO custom 问题sql public static Map getFieldId(int formid, String num) { + + logger_6c507bbc.info("BillFieldUtil getFieldId start formid "+ formid); + logger_6c507bbc.info("num "+ num); formid = Math.abs(formid); String sql = ""; if ("0".equals(num)) { @@ -43,14 +46,18 @@ public class BillFieldUtil { } else { sql = "select b.id,fieldname,detailtable from workflow_billfield b ,workflow_base a where b.billid=-" + formid + " and a.formid=b.billid and detailtable='formtable_main_" + formid + "_dt" + num + "'"; } + + logger_6c507bbc.info("sql "+ sql); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname); Map array = new HashMap(); while (rs.next()) { + logger_6c507bbc.info("fieldname "+ rs.getString("fieldname")); array.put(Util.null2String(rs.getString("fieldname")).toLowerCase(), Util.null2String(rs.getString("id"))); } + logger_6c507bbc.info("array "+ array); return array; } @@ -68,6 +75,12 @@ public class BillFieldUtil { //TODO 问题sql public static String getlabelId(String name, int formid, String ismain, String num) { + + logger_6c507bbc.info("BillFieldUtil getlabelId start "); + logger_6c507bbc.info("name----------- " + name); + logger_6c507bbc.info("formid----------- " + formid); + logger_6c507bbc.info("ismain----------- " + ismain); + logger_6c507bbc.info("num----------- " + num); String id = ""; String sql = ""; formid = formid * -1; @@ -77,6 +90,7 @@ public class BillFieldUtil { sql = "select id,fieldname,detailtable from workflow_billfield where billid=-" + formid + " and detailtable='formtable_main_" + formid + "_dt" + num + "' and lower(fieldname)='" + name + "'"; } // System.out.println(sql); + logger_6c507bbc.info("sql----------- " + sql); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname_a1 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -84,6 +98,7 @@ public class BillFieldUtil { if (rs.next()) { id = Util.null2String(rs.getString("id")); } + logger_6c507bbc.info("id----------- " + id); return id; } @@ -95,6 +110,7 @@ public class BillFieldUtil { * @return */ public static String getselectName(String val, String id) { + logger_6c507bbc.info("BillFieldUtil getselectName start "); String name = ""; if (val.equals("")) { return ""; @@ -102,10 +118,13 @@ public class BillFieldUtil { RecordSet recordSet = I18nContextUtil.getBean(RecordSet.class); String poolname_n1 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - recordSet.executeSql("select name,field_id from field_option as workflow_selectItem where field_id =" + Util.getIntValue(id, 0) + " and selectvalue = " + Util.getIntValue(val, 0), poolname_n1); + String sql = "select name,field_id from field_option as workflow_selectItem where field_id =" + Util.getIntValue(id, 0) + " and selectvalue = " + Util.getIntValue(val, 0); + logger_6c507bbc.info("sql----------- " + sql); + recordSet.executeSql(sql, poolname_n1); if (recordSet.next()) { name = recordSet.getString("selectname"); } + logger_6c507bbc.info("name----------- " + name); return name; } @@ -117,12 +136,16 @@ public class BillFieldUtil { // TODO custom 问题sql public static String getselectNameByCol(String fieldname, String workflowid, String selectvalue) { + logger_6c507bbc.info("BillFieldUtil getselectNameByCol start "); + logger_6c507bbc.info("fieldname----------- " + fieldname); + logger_6c507bbc.info("workflowid----------- " + workflowid); + logger_6c507bbc.info("selectvalue----------- " + selectvalue); String name = ""; RecordSet recordSet = I18nContextUtil.getBean(RecordSet.class); String poolname_jl = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - recordSet.executeSql("select c.name from wfp_base a " + "INNER JOIN form_field b on a.formid=b.form_id " + "INNER JOIN field_option c on b.id=c.field_id " + "where b.fieldname='" + fieldname + "' and a.id=" + workflowid + " and c.selectvalue=" + selectvalue, poolname_jl); - recordSet.executeSql("SELECT c.name AS selectname\n" + +// recordSet.executeSql("select c.name from wfp_base a " + "INNER JOIN form_field b on a.formid=b.form_id " + "INNER JOIN field_option c on b.id=c.field_id " + "where b.fieldname='" + fieldname + "' and a.id=" + workflowid + " and c.selectvalue=" + selectvalue, poolname_jl); + String sql = "SELECT c.name AS selectname\n" + "FROM e10_core_business.dbo.wfp_base a\n" + "\tINNER JOIN e10_core_business.dbo.form_field b\n" + "\tON a.formid = b.form_id\n" + @@ -140,10 +163,15 @@ public class BillFieldUtil { "\tAND c.tenant_key = 't6kj9c07jr'\n" + "WHERE b.data_key = '" + fieldname + "' \n" + "\tAND a.id = '" + workflowid + "'\n" + - "\tAND c.value_key = '"+selectvalue+"';", poolname_jl); + "\tAND c.value_key = '"+selectvalue+"';"; + logger_6c507bbc.info("sql----------- " + sql); + + recordSet.executeSql(sql, poolname_jl); + if (recordSet.next()) { name = recordSet.getString("selectname"); } + logger_6c507bbc.info("name----------- " + name); return name; } @@ -219,14 +247,18 @@ public class BillFieldUtil { * @return */ public String getUnitno(String unitid) { + logger_6c507bbc.info("BillFieldUtil getUnitno start "); + logger_6c507bbc.info("unitid----------- " + unitid); String unitno = ""; RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname_rg = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select id,dwnm from formtable_main_286 where id=" + Util.getIntValue(unitid, 0), poolname_rg); + String sql = "select id,dwnm from formtable_main_286 where id=" + Util.getIntValue(unitid, 0); + rs.executeSql(sql, poolname_rg); if (rs.next()) { unitno = rs.getString("dwnm"); } + logger_6c507bbc.info("unitno----------- " + unitno); return unitno; } @@ -236,14 +268,18 @@ public class BillFieldUtil { * @return */ public String getWorkcode(String hrid) { + logger_6c507bbc.info("BillFieldUtil getWorkcode start "); + logger_6c507bbc.info("hrid----------- " + hrid); String code = ""; RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname_vp = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select job_num from employee as HrmResource where id = " + hrid, poolname_vp); + String sql = "select job_num from employee as HrmResource where id = " + hrid; + rs.executeSql(sql, poolname_vp); if (rs.next()) { code = Util.null2String(rs.getString("workcode")); } + logger_6c507bbc.info("code----------- " + code); return code; } @@ -255,14 +291,18 @@ public class BillFieldUtil { // TODO custom 问题sql public String getCredentialsNumber(String hrid) { + logger_6c507bbc.info("BillFieldUtil getCredentialsNumber start "); + logger_6c507bbc.info("hrid----------- " + hrid); String code = ""; RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname_2s = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select id_no from employee as HrmResource where id = " + hrid, poolname_2s); + String sql = "select id_no from employee as HrmResource where id = " + hrid; + rs.executeSql(sql, poolname_2s); if (rs.next()) { code = Util.null2String(rs.getString("certificatenum")); } + logger_6c507bbc.info("code----------- " + code); return code; } @@ -272,14 +312,19 @@ public class BillFieldUtil { * @return */ public String getDepartmentname(String dpid) { + logger_6c507bbc.info("BillFieldUtil getDepartmentname start "); + logger_6c507bbc.info("dpid----------- " + dpid); String dpname = ""; RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname_p1 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select fullname from eteams.dbo.department as HrmDepartment where id = " + dpid, poolname_p1); + String sql = "select fullname from eteams.dbo.department as HrmDepartment where id = " + dpid; + rs.executeSql(sql, poolname_p1); + if (rs.next()) { dpname = Util.null2String(rs.getString("departmentname")); } + logger_6c507bbc.info("dpname----------- " + dpname); return dpname; } @@ -289,6 +334,8 @@ public class BillFieldUtil { * @return */ public String getSubcompanyname(String spid) { + logger_6c507bbc.info("BillFieldUtil getSubcompanyname start "); + logger_6c507bbc.info("spid----------- " + spid); String spname = ""; RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname_tg = CONN_TYPE.workflow.getType(); @@ -297,6 +344,7 @@ public class BillFieldUtil { if (rs.next()) { spname = Util.null2String(rs.getString("subcompanyname")); } + logger_6c507bbc.info("spname----------- " + spname); return spname; } @@ -308,7 +356,8 @@ public class BillFieldUtil { // TODO custom 问题sql public String getTablename(String wfid) { - logger_6c507bbc.info("getTablename start " + wfid); + logger_6c507bbc.info("BillFieldUtil getSubcompanyname start "); + logger_6c507bbc.info("wfid----------- " + wfid); String tbname = ""; String fmid = ""; RecordSet rs = I18nContextUtil.getBean(RecordSet.class); @@ -319,6 +368,7 @@ public class BillFieldUtil { fmid = Util.null2String(rs.getString("formid")); tbname = "formtable_main_" + fmid.replace("-", ""); } + logger_6c507bbc.info("tbname----------- " + tbname); return tbname; } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_IORD_RFC_CheckAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_IORD_RFC_CheckAction.java index d39793c..28b0443 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_IORD_RFC_CheckAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_IORD_RFC_CheckAction.java @@ -85,16 +85,16 @@ public class ZOA_FI_IORD_RFC_CheckAction extends BaseBean implements Action, Esb } } catch (Exception e) { requestinfo.getRequestManager().setMessageid("ERROR"); - requestinfo.getRequestManager().setMessagecontent("SAP返回错误信息：" + e.toString()); - logger_ca356311.error(String.valueOf("ZOA_FI_IORD_RFC_CheckAction--error--[" + e.toString() + "]-" + requestid)); - return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestinfo.getRequestManager())); + requestinfo.getRequestManager().setMessagecontent("SAP返回错误信息："); + logger_ca356311.error(String.valueOf("ZOA_FI_IORD_RFC_CheckAction--error--["), e); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e, requestinfo.getRequestManager())); } logger_ca356311.info(String.valueOf("ZOA_FI_IORD_RFC_CheckAction--end--" + requestid)); return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager())); } catch (Exception e) { e.printStackTrace(); - logger_ca356311.error("ZOA_FI_IORD_RFC_CheckAction e: {}", e.getMessage()); - return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestinfo.getRequestManager())); + logger_ca356311.error("ZOA_FI_IORD_RFC_CheckAction e: {}"+ e); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e, requestinfo.getRequestManager())); } }