From 88518dd24614aad98a9adae21a008e86af9928c9 Mon Sep 17 00:00:00 2001 From: calyrex <2213354201@qq.com> Date: Mon, 23 Dec 2024 15:59:41 +0800 Subject: [PATCH] BillFieldUtil updates --- .../com/weaver/seconddev/interfaces/swfa/BillFieldUtil.java | 2 +- .../workflow/action/OaSrmVendorQualityConfirmAction.java | 3 ++- .../interfaces/workflow/action/OaSrmVendorReapplyAction.java | 3 +++ .../interfaces/workflow/action/OaSrmVendorSyncAction.java | 5 ++++- 4 files changed, 10 insertions(+), 3 deletions(-) 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 eff6306..0a8d1d5 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 @@ -276,7 +276,7 @@ public class BillFieldUtil { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname_p1 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select fullname from department as HrmDepartment where id = " + dpid, poolname_p1); + rs.executeSql("select fullname from eteams.dbo.department as HrmDepartment where id = " + dpid, poolname_p1); if (rs.next()) { dpname = Util.null2String(rs.getString("departmentname")); } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorQualityConfirmAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorQualityConfirmAction.java index 07b6da9..3f836e7 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorQualityConfirmAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorQualityConfirmAction.java @@ -46,6 +46,7 @@ public class OaSrmVendorQualityConfirmAction extends BaseBean implements Action, private ConfigProp configProp; @Override public WeaResult> execute(Map requestInfoMap) { + logger_ffadea7c.info("OaSrmVendorQualityConfirmAction start"); Map weaverResultMap = new HashMap<>(); Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1))); Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1))); @@ -157,7 +158,7 @@ public class OaSrmVendorQualityConfirmAction extends BaseBean implements Action, } catch (Exception e) { e.printStackTrace(); logger_ffadea7c.error("OaSrmVendorQualityConfirmAction e: {}", e.getMessage()); - return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestInfo.getRequestManager())), requestInfo.getRequestManager())); + return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestInfo.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorReapplyAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorReapplyAction.java index 8d0c22f..079e81b 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorReapplyAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorReapplyAction.java @@ -46,6 +46,7 @@ public class OaSrmVendorReapplyAction extends BaseBean implements Action, EsbSer @Override public WeaResult> execute(Map requestInfoMap) { + logger_a5e612ac.info("OaSrmVendorReapplyAction start"); Map weaverResultMap = new HashMap<>(); Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1))); Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1))); @@ -140,6 +141,7 @@ public class OaSrmVendorReapplyAction extends BaseBean implements Action, EsbSer } int dtcount = 0; String sql = "select b.* from " + tablename + " a," + tablename + "_dt3 b where a.id=b.mainid and a.requestid=" + requestid; + logger_a5e612ac.info("sql-->" + sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname); @@ -218,6 +220,7 @@ public class OaSrmVendorReapplyAction extends BaseBean implements Action, EsbSer Row[] sq = dtq.getRow(); int dtcount = 0; String sql = "select distinct wlh from " + tablename + " a," + tablename + "_dt2 b where a.id=b.mainid and a.requestid=" + requestid; + logger_a5e612ac.info("sql-->" + sql); String poolname_uh = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname_uh); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorSyncAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorSyncAction.java index 5afc779..30c75c6 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorSyncAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorSyncAction.java @@ -46,6 +46,7 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer @Override public WeaResult> execute(Map requestInfoMap) { + logger_41a64316.info("OaSrmVendorSyncAction start"); Map weaverResultMap = new HashMap<>(); Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1))); Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1))); @@ -139,6 +140,7 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer } int dtcount = 0; String sql = "select b.* from " + tablename + " a," + tablename + "_dt3 b where a.id=b.mainid and a.requestid=" + requestid; + logger_41a64316.info(String.valueOf("sql-->" + sql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname); @@ -214,6 +216,7 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer Row[] sq = dtq.getRow(); int dtcount = 0; String sql = "select distinct wlh from " + tablename + " a," + tablename + "_dt2 b where a.id=b.mainid and a.requestid=" + requestid; + logger_41a64316.info("sql-->" + sql); String poolname_wk = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname_wk); @@ -330,7 +333,7 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer } catch (Exception e) { e.printStackTrace(); logger_41a64316.error("OaSrmVendorSyncAction e: {}", e.getMessage()); - return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestinfo.getRequestManager())), requestinfo.getRequestManager())); + return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestinfo.getRequestManager())); } }