From 540b931a8f0966fb80c5b144aa2b3f8cd7a51bec Mon Sep 17 00:00:00 2001 From: qijirenjian Date: Fri, 3 Jan 2025 16:49:39 +0800 Subject: [PATCH] tablename --- .../interfaces/eipoa/AccountService.java | 2 + .../interfaces/htjt/util/TransUtil.java | 830 +++++++++--------- .../action/AddVenMatExtsToSrmAction.java | 11 +- .../action/AddVenMatExtsToSrmCheckAction.java | 8 +- .../workflow/action/BuQianKaAction.java | 2 + .../workflow/action/DoTheAction.java | 2 +- .../workflow/action/DoTheActionNew.java | 2 +- .../workflow/action/K3PORequestAction.java | 3 +- .../workflow/action/LastOperateAction.java | 4 +- .../action/OaSrmVendorPunishCommitAction.java | 4 +- .../OaSrmVendorPunishConfirmAction.java | 5 +- .../OaSrmVendorQualityConfirmAction.java | 5 +- .../workflow/action/OaWmsReturnAction.java | 3 +- .../action/OperateEmailAccountAction.java | 3 +- .../workflow/action/SendPostRequest_PO.java | 7 +- .../action/ZOA_MM_PR_CREATE_BpAction.java | 3 +- .../action/ZOA_MM_PR_CREATE_FYH_BgAction.java | 3 +- .../action/ZOA_MM_PR_CREATE_FYH_FyAction.java | 3 +- .../ZOA_MM_PR_CREATE_GDZC_ZcAction.java | 3 +- .../action/ZOA_MM_PR_CREATE_LbAction.java | 3 +- .../ZOA_MM_PR_CREATE_YFFY_ZjAction.java | 3 +- 21 files changed, 471 insertions(+), 438 deletions(-) diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/AccountService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/AccountService.java index 4e95131..53fc24c 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/AccountService.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/AccountService.java @@ -45,6 +45,8 @@ public class AccountService extends BaseBean { SI_HTPortalUAMGMT2_OUTServiceStub.UserAccount request = new SI_HTPortalUAMGMT2_OUTServiceStub.UserAccount(); request.setSendid(sendid); request.setUser(arr); + logger_18cc50ce.info(String.valueOf(" start stub")); + SI_HTPortalUAMGMT2_OUTServiceStub.UserAccountResponse response = stub.sI_HTPortalUAMGMT2_OUT(request); array[0] = "S"; array[1] = response.getUserAccountReturn(); 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 5e44ceb..355448e 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 @@ -23,22 +23,22 @@ public class TransUtil { * @param selectname * @return */ - public String getSelectValue(String tableName, String filedname, String selectname) { - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String value = ""; - if ("".equals(selectname)) { - return value; - } - String sql = "select c.selectvalue 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.selectname='" + selectname + "'"; - String poolname = CONN_TYPE.workflow.getType(); - /* writeLog("sql:"+sql); - TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - rs.executeSql(sql, poolname); - if (rs.next()) { - value = Util.null2String(rs.getString("selectvalue")); - } - return value; - } +// public String getSelectValue(String tableName, String filedname, String selectname) { +// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); +// String value = ""; +// if ("".equals(selectname)) { +// return value; +// } +// String sql = "select c.selectvalue 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.selectname='" + selectname + "'"; +// String poolname = CONN_TYPE.workflow.getType(); +// /* writeLog("sql:"+sql); +// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ +// rs.executeSql(sql, poolname); +// if (rs.next()) { +// value = Util.null2String(rs.getString("selectvalue")); +// } +// return value; +// } public String getSelectName(String tableName, String filedname, String selectvalue) { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); @@ -77,426 +77,426 @@ public class TransUtil { * @param bs * @return */ - public String getWfid(String bs) { - String wfid = ""; - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "select wfid from uf_K3_cf_mt where bs='" + bs + "'"; - String poolname_n9 = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_n9); - if (rs.next()) { - wfid = Util.null2String(rs.getString("wfid")); - } - return wfid; - } +// public String getWfid(String bs) { +// String wfid = ""; +// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); +// String sql = "select wfid from uf_K3_cf_mt where bs='" + bs + "'"; +// String poolname_n9 = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// rs.executeSql(sql, poolname_n9); +// if (rs.next()) { +// wfid = Util.null2String(rs.getString("wfid")); +// } +// return wfid; +// } - public String getTableName(String wfid) { - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String tableName = ""; - String poolname_ss = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select tablename from form as workflow_bill where id=(select formid from wfp_base as workflow_base where id=" + wfid + ")", poolname_ss); - if (rs.next()) { - tableName = Util.null2String(rs.getString("tablename")); - } - return tableName; - } +// public String getTableName(String wfid) { +// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); +// String tableName = ""; +// String poolname_ss = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// rs.executeSql("select tablename from form as workflow_bill where id=(select formid from wfp_base as workflow_base where id=" + wfid + ")", poolname_ss); +// if (rs.next()) { +// tableName = Util.null2String(rs.getString("tablename")); +// } +// return tableName; +// } - public String getResourceId(String workcode) { - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - if ("".equals(workcode)) { - return ""; - } - String ryid = ""; - String sql = "select id from employee as hrmresource where workcode='" + workcode + "'"; - String poolname_ts = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_ts); - if (rs.next()) { - ryid = Util.null2String(rs.getString("id")); - } - return ryid; - } +// public String getResourceId(String workcode) { +// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); +// if ("".equals(workcode)) { +// return ""; +// } +// String ryid = ""; +// String sql = "select id from employee as hrmresource where workcode='" + workcode + "'"; +// String poolname_ts = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// rs.executeSql(sql, poolname_ts); +// if (rs.next()) { +// ryid = Util.null2String(rs.getString("id")); +// } +// return ryid; +// } - public String getMultResourceId(String workcodes) { - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - if ("".equals(workcodes)) { - return ""; - } - String allworkcode = "'" + workcodes.replace(",", "','") + "'"; - String ryid = ""; - String ryids = ""; - String flag = ""; - String sql = "select id from employee as hrmresource where workcode in (" + allworkcode + ")"; - String poolname_3m = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_3m); - while (rs.next()) { - ryid = Util.null2String(rs.getString("id")); - ryids = ryids + flag + ryid; - flag = ","; - } - return ryids; - } +// public String getMultResourceId(String workcodes) { +// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); +// if ("".equals(workcodes)) { +// return ""; +// } +// String allworkcode = "'" + workcodes.replace(",", "','") + "'"; +// String ryid = ""; +// String ryids = ""; +// String flag = ""; +// String sql = "select id from employee as hrmresource where workcode in (" + allworkcode + ")"; +// String poolname_3m = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// rs.executeSql(sql, poolname_3m); +// while (rs.next()) { +// ryid = Util.null2String(rs.getString("id")); +// ryids = ryids + flag + ryid; +// flag = ","; +// } +// return ryids; +// } - public String getMultResourceGUID(String ryids) { - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - if ("".equals(ryids)) { - return ""; - } - String guids = ""; - String flag = ""; - String textfield1 = ""; - String sql = "select textfield1 from employee as hrmresource where id in (" + ryids + ")"; - String poolname_pn = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_pn); - while (rs.next()) { - textfield1 = Util.null2String(rs.getString("textfield1")); - if (!"".equals(textfield1)) { - guids = guids + flag + textfield1; - flag = ","; - } - } - return guids; - } +// public String getMultResourceGUID(String ryids) { +// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); +// if ("".equals(ryids)) { +// return ""; +// } +// String guids = ""; +// String flag = ""; +// String textfield1 = ""; +// String sql = "select textfield1 from employee as hrmresource where id in (" + ryids + ")"; +// String poolname_pn = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// rs.executeSql(sql, poolname_pn); +// while (rs.next()) { +// textfield1 = Util.null2String(rs.getString("textfield1")); +// if (!"".equals(textfield1)) { +// guids = guids + flag + textfield1; +// flag = ","; +// } +// } +// return guids; +// } - public String getMultDepartmentId(String codes) { - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - if ("".equals(codes)) { - return ""; - } - String allcodes = "'" + codes.replace(",", "','") + "'"; - String dpid = ""; - String dpids = ""; - String flag = ""; - String sql = "select id from department as hrmdepartment where departmentcode in(" + allcodes + ")"; - String poolname_u8 = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_u8); - while (rs.next()) { - dpid = Util.null2String(rs.getString("id")); - dpids = dpids + flag + dpid; - flag = ","; - } - return dpids; - } +// public String getMultDepartmentId(String codes) { +// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); +// if ("".equals(codes)) { +// return ""; +// } +// String allcodes = "'" + codes.replace(",", "','") + "'"; +// String dpid = ""; +// String dpids = ""; +// String flag = ""; +// String sql = "select id from department as hrmdepartment where departmentcode in(" + allcodes + ")"; +// String poolname_u8 = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// rs.executeSql(sql, poolname_u8); +// while (rs.next()) { +// dpid = Util.null2String(rs.getString("id")); +// dpids = dpids + flag + dpid; +// flag = ","; +// } +// return dpids; +// } - public String getDepartmentId(String code) { - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - if ("".equals(code)) { - return ""; - } - String dpid = ""; - String sql = "select id from department as hrmdepartment where departmentcode='" + code + "'"; - String poolname_0g = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_0g); - if (rs.next()) { - dpid = Util.null2String(rs.getString("id")); - } - return dpid; - } +// public String getDepartmentId(String code) { +// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); +// if ("".equals(code)) { +// return ""; +// } +// String dpid = ""; +// String sql = "select id from department as hrmdepartment where departmentcode='" + code + "'"; +// String poolname_0g = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// rs.executeSql(sql, poolname_0g); +// if (rs.next()) { +// dpid = Util.null2String(rs.getString("id")); +// } +// return dpid; +// } - public String getDepartmentCode(String id) { - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - if ("".equals(id)) { - return ""; - } - String departmentcode = ""; - String sql = "select code from department as hrmdepartment where id='" + id + "'"; - String poolname_2h = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_2h); - if (rs.next()) { - departmentcode = Util.null2String(rs.getString("departmentcode")); - } - return departmentcode; - } +// public String getDepartmentCode(String id) { +// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); +// if ("".equals(id)) { +// return ""; +// } +// String departmentcode = ""; +// String sql = "select code from department as hrmdepartment where id='" + id + "'"; +// String poolname_2h = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// rs.executeSql(sql, poolname_2h); +// if (rs.next()) { +// departmentcode = Util.null2String(rs.getString("departmentcode")); +// } +// return departmentcode; +// } - public String getMultDepartmentCode(String ids) { - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - if ("".equals(ids)) { - return ""; - } - String departmentcode = ""; - String departmentcodes = ""; - String flag = ""; - String sql = "select code from department as hrmdepartment where id in(" + ids + ")"; - String poolname_x9 = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_x9); - while (rs.next()) { - departmentcode = Util.null2String(rs.getString("departmentcode")); - departmentcodes = departmentcodes + flag + departmentcode; - flag = ","; - } - return departmentcodes; - } +// public String getMultDepartmentCode(String ids) { +// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); +// if ("".equals(ids)) { +// return ""; +// } +// String departmentcode = ""; +// String departmentcodes = ""; +// String flag = ""; +// String sql = "select code from department as hrmdepartment where id in(" + ids + ")"; +// String poolname_x9 = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// rs.executeSql(sql, poolname_x9); +// while (rs.next()) { +// departmentcode = Util.null2String(rs.getString("departmentcode")); +// departmentcodes = departmentcodes + flag + departmentcode; +// flag = ","; +// } +// return departmentcodes; +// } - public String getMultDepartmentName(String ids) { - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - if ("".equals(ids)) { - return ""; - } - String departmentname = ""; - String departmentnames = ""; - String flag = ""; - String sql = "select fullname from department as hrmdepartment where id in(" + ids + ")"; - String poolname_t6 = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_t6); - while (rs.next()) { - departmentname = Util.null2String(rs.getString("departmentname")); - departmentnames = departmentnames + flag + departmentname; - flag = ","; - } - return departmentnames; - } +// public String getMultDepartmentName(String ids) { +// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); +// if ("".equals(ids)) { +// return ""; +// } +// String departmentname = ""; +// String departmentnames = ""; +// String flag = ""; +// String sql = "select fullname from department as hrmdepartment where id in(" + ids + ")"; +// String poolname_t6 = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// rs.executeSql(sql, poolname_t6); +// while (rs.next()) { +// departmentname = Util.null2String(rs.getString("departmentname")); +// departmentnames = departmentnames + flag + departmentname; +// flag = ","; +// } +// return departmentnames; +// } - public String getWorkcode(String ryid) { - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - if ("".equals(ryid)) { - return ""; - } - String workcode = ""; - String sql = "select job_num from employee as hrmresource where id='" + ryid + "'"; - String poolname_6e = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_6e); - if (rs.next()) { - workcode = Util.null2String(rs.getString("workcode")); - } - return workcode; - } +// public String getWorkcode(String ryid) { +// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); +// if ("".equals(ryid)) { +// return ""; +// } +// String workcode = ""; +// String sql = "select job_num from employee as hrmresource where id='" + ryid + "'"; +// String poolname_6e = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// rs.executeSql(sql, poolname_6e); +// if (rs.next()) { +// workcode = Util.null2String(rs.getString("workcode")); +// } +// return workcode; +// } - public String getMultWorkcode(String ryids) { - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - if ("".equals(ryids)) { - return ""; - } - String workcodes = ""; - String flag = ""; - String workcode = ""; - String sql = "select job_num from employee as hrmresource where id in (" + ryids + ")"; - String poolname_rv = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_rv); - while (rs.next()) { - workcode = Util.null2String(rs.getString("workcode")); - if (!"".equals(workcode)) { - workcodes = workcodes + flag + workcode; - flag = ","; - } - } - return workcodes; - } +// public String getMultWorkcode(String ryids) { +// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); +// if ("".equals(ryids)) { +// return ""; +// } +// String workcodes = ""; +// String flag = ""; +// String workcode = ""; +// String sql = "select job_num from employee as hrmresource where id in (" + ryids + ")"; +// String poolname_rv = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// rs.executeSql(sql, poolname_rv); +// while (rs.next()) { +// workcode = Util.null2String(rs.getString("workcode")); +// if (!"".equals(workcode)) { +// workcodes = workcodes + flag + workcode; +// flag = ","; +// } +// } +// return workcodes; +// } - public String getMultResourceName(String ryids) { - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - if ("".equals(ryids)) { - return ""; - } - String name = ""; - String flag = ""; - String names = ""; - String sql = "select username from employee as hrmresource where id in (" + ryids + ")"; - String poolname_xj = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_xj); - while (rs.next()) { - name = Util.null2String(rs.getString("lastname")); - if (!"".equals(name)) { - names = names + flag + name; - flag = ","; - } - } - return names; - } +// public String getMultResourceName(String ryids) { +// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); +// if ("".equals(ryids)) { +// return ""; +// } +// String name = ""; +// String flag = ""; +// String names = ""; +// String sql = "select username from employee as hrmresource where id in (" + ryids + ")"; +// String poolname_xj = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// rs.executeSql(sql, poolname_xj); +// while (rs.next()) { +// name = Util.null2String(rs.getString("lastname")); +// if (!"".equals(name)) { +// names = names + flag + name; +// flag = ","; +// } +// } +// return names; +// } +// +// public String getSubcompanyId(String code) { +// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); +// if ("".equals(code)) { +// return ""; +// } +// String subid = ""; +// String sql = "select id from department as hrmsubcompany where subcompanycode='" + code + "'"; +// String poolname_5d = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// rs.executeSql(sql, poolname_5d); +// if (rs.next()) { +// subid = Util.null2String(rs.getString("id")); +// } +// return subid; +// } +// +// public String getMultSubcompanyId(String codes) { +// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); +// if ("".equals(codes)) { +// return ""; +// } +// String allcodes = "'" + codes.replace(",", "','") + "'"; +// String subid = ""; +// String subids = ""; +// String flag = ""; +// String sql = "select id from department as hrmsubcompany where subcompanycode in(" + allcodes + ")"; +// String poolname_is = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// rs.executeSql(sql, poolname_is); +// while (rs.next()) { +// subid = Util.null2String(rs.getString("id")); +// subids = subids + flag + subid; +// flag = ","; +// } +// return subids; +// } +// +// public String getSubcompanyCode(String id) { +// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); +// if ("".equals(id)) { +// return ""; +// } +// String subcompanycode = ""; +// String sql = "select code from department as hrmsubcompany where id='" + id + "'"; +// String poolname_47 = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// rs.executeSql(sql, poolname_47); +// if (rs.next()) { +// subcompanycode = Util.null2String(rs.getString("subcompanycode")); +// } +// return subcompanycode; +// } - public String getSubcompanyId(String code) { - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - if ("".equals(code)) { - return ""; - } - String subid = ""; - String sql = "select id from department as hrmsubcompany where subcompanycode='" + code + "'"; - String poolname_5d = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_5d); - if (rs.next()) { - subid = Util.null2String(rs.getString("id")); - } - return subid; - } +// public String getMultSubcompanyCode(String ids) { +// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); +// if ("".equals(ids)) { +// return ""; +// } +// String subcompanycode = ""; +// String subcompanycodes = ""; +// String flag = ""; +// String sql = "select code from department as hrmsubcompany where id in(" + ids + ")"; +// String poolname_zc = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// rs.executeSql(sql, poolname_zc); +// while (rs.next()) { +// subcompanycode = Util.null2String(rs.getString("subcompanycode")); +// subcompanycodes = subcompanycodes + flag + subcompanycode; +// flag = ","; +// } +// return subcompanycodes; +// } +// +// public String getMultSubcompanyName(String ids) { +// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); +// if ("".equals(ids)) { +// return ""; +// } +// String subcompanyname = ""; +// String subcompanynames = ""; +// String flag = ""; +// String sql = "select name from department as hrmsubcompany where id in(" + ids + ")"; +// String poolname_eh = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// rs.executeSql(sql, poolname_eh); +// while (rs.next()) { +// subcompanyname = Util.null2String(rs.getString("subcompanyname")); +// subcompanynames = subcompanynames + flag + subcompanyname; +// flag = ","; +// } +// return subcompanynames; +// } - public String getMultSubcompanyId(String codes) { - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - if ("".equals(codes)) { - return ""; - } - String allcodes = "'" + codes.replace(",", "','") + "'"; - String subid = ""; - String subids = ""; - String flag = ""; - String sql = "select id from department as hrmsubcompany where subcompanycode in(" + allcodes + ")"; - String poolname_is = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_is); - while (rs.next()) { - subid = Util.null2String(rs.getString("id")); - subids = subids + flag + subid; - flag = ","; - } - return subids; - } +// public void writeLog(Object obj) { +// if (true) { +// logger_24a1e280.info(String.valueOf(obj)); +// } +// } +// +// public void writeLog(String className, Object obj) { +// if (true) { +// logger_24a1e280.info(String.valueOf(obj)); +// } +// } - public String getSubcompanyCode(String id) { - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - if ("".equals(id)) { - return ""; - } - String subcompanycode = ""; - String sql = "select code from department as hrmsubcompany where id='" + id + "'"; - String poolname_47 = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_47); - if (rs.next()) { - subcompanycode = Util.null2String(rs.getString("subcompanycode")); - } - return subcompanycode; - } +// public String getModeId(String tableName) { +// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); +// String formid = ""; +// String modeid = ""; +// String sql = "select id from form as workflow_bill where tablename='" + tableName + "'"; +// String poolname_tt = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// rs.executeSql(sql, poolname_tt); +// if (rs.next()) { +// formid = Util.null2String(rs.getString("id")); +// } +// sql = "select id from ebdf_obj as modeinfo where formid=" + formid; +// String poolname_v5 = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// rs.executeSql(sql, poolname_v5); +// if (rs.next()) { +// modeid = Util.null2String(rs.getString("id")); +// } +// return modeid; +// } - public String getMultSubcompanyCode(String ids) { - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - if ("".equals(ids)) { - return ""; - } - String subcompanycode = ""; - String subcompanycodes = ""; - String flag = ""; - String sql = "select code from department as hrmsubcompany where id in(" + ids + ")"; - String poolname_zc = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_zc); - while (rs.next()) { - subcompanycode = Util.null2String(rs.getString("subcompanycode")); - subcompanycodes = subcompanycodes + flag + subcompanycode; - flag = ","; - } - return subcompanycodes; - } +// public String getFormId(String tableName) { +// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); +// String formid = ""; +// String sql = "select id from form as workflow_bill where tablename='" + tableName + "'"; +// String poolname_n2 = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// rs.executeSql(sql, poolname_n2); +// if (rs.next()) { +// formid = Util.null2String(rs.getString("id")); +// } +// return formid; +// } - public String getMultSubcompanyName(String ids) { - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - if ("".equals(ids)) { - return ""; - } - String subcompanyname = ""; - String subcompanynames = ""; - String flag = ""; - String sql = "select name from department as hrmsubcompany where id in(" + ids + ")"; - String poolname_eh = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_eh); - while (rs.next()) { - subcompanyname = Util.null2String(rs.getString("subcompanyname")); - subcompanynames = subcompanynames + flag + subcompanyname; - flag = ","; - } - return subcompanynames; - } - - public void writeLog(Object obj) { - if (true) { - logger_24a1e280.info(String.valueOf(obj)); - } - } - - public void writeLog(String className, Object obj) { - if (true) { - logger_24a1e280.info(String.valueOf(obj)); - } - } - - public String getModeId(String tableName) { - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String formid = ""; - String modeid = ""; - String sql = "select id from form as workflow_bill where tablename='" + tableName + "'"; - String poolname_tt = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_tt); - if (rs.next()) { - formid = Util.null2String(rs.getString("id")); - } - sql = "select id from ebdf_obj as modeinfo where formid=" + formid; - String poolname_v5 = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_v5); - if (rs.next()) { - modeid = Util.null2String(rs.getString("id")); - } - return modeid; - } - - public String getFormId(String tableName) { - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String formid = ""; - String sql = "select id from form as workflow_bill where tablename='" + tableName + "'"; - String poolname_n2 = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_n2); - if (rs.next()) { - formid = Util.null2String(rs.getString("id")); - } - return formid; - } - - public Map getResourceInfo(String ryid) { - Map info = new HashMap<>(); - if ("".equals(ryid)) { - return info; - } - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "select a.id as ryid,a.username,a.job_num ,a.department ,a.subcompanyid ," + "b.fullname ,c.subcompanyname from employee a,department b,HrmSubCompany c " + "where a.department =b.id and a.subcompanyid =c.id and a.id=" + ryid; - String poolname_ln = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_ln); - if (rs.next()) { - info.put("ryid", Util.null2String(rs.getString("ryid"))); - info.put("lastname", Util.null2String(rs.getString("lastname"))); - info.put("workcode", Util.null2String(rs.getString("workcode"))); - info.put("departmentid", Util.null2String(rs.getString("departmentid"))); - info.put("subcompanyid1", Util.null2String(rs.getString("subcompanyid1"))); - info.put("departmentname", Util.null2String(rs.getString("departmentname"))); - info.put("subcompanyname", Util.null2String(rs.getString("subcompanyname"))); - } - return info; - } +// public Map getResourceInfo(String ryid) { +// Map info = new HashMap<>(); +// if ("".equals(ryid)) { +// return info; +// } +// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); +// String sql = "select a.id as ryid,a.username,a.job_num ,a.department ,a.subcompanyid ," + "b.fullname ,c.subcompanyname from employee a,department b,HrmSubCompany c " + "where a.department =b.id and a.subcompanyid =c.id and a.id=" + ryid; +// String poolname_ln = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// rs.executeSql(sql, poolname_ln); +// if (rs.next()) { +// info.put("ryid", Util.null2String(rs.getString("ryid"))); +// info.put("lastname", Util.null2String(rs.getString("lastname"))); +// info.put("workcode", Util.null2String(rs.getString("workcode"))); +// info.put("departmentid", Util.null2String(rs.getString("departmentid"))); +// info.put("subcompanyid1", Util.null2String(rs.getString("subcompanyid1"))); +// info.put("departmentname", Util.null2String(rs.getString("departmentname"))); +// info.put("subcompanyname", Util.null2String(rs.getString("subcompanyname"))); +// } +// return info; +// } /** * 获取角色人员ids * @param roleid * @return */ - public String getRoleMembers(String roleid) { - String ryids = ""; - String flag = ""; - if (!"".equals(roleid)) { - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "select user_id from auth_user_role hrm where roleid=" + roleid + " and resourcetype=1"; - String poolname_53 = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_53); - while (rs.next()) { - String resourceid = Util.null2String(rs.getString("resourceid")); - if (!"".equals(resourceid)) { - ryids = ryids + flag + resourceid; - flag = ","; - } - } - } - return ryids; - } +// public String getRoleMembers(String roleid) { +// String ryids = ""; +// String flag = ""; +// if (!"".equals(roleid)) { +// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); +// String sql = "select user_id from auth_user_role hrm where roleid=" + roleid + " and resourcetype=1"; +// String poolname_53 = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// rs.executeSql(sql, poolname_53); +// while (rs.next()) { +// String resourceid = Util.null2String(rs.getString("resourceid")); +// if (!"".equals(resourceid)) { +// ryids = ryids + flag + resourceid; +// flag = ","; +// } +// } +// } +// return ryids; +// } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmAction.java index 63250d8..fe235cd 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmAction.java @@ -41,6 +41,9 @@ public class AddVenMatExtsToSrmAction extends BaseBean implements Action, EsbSer @Autowired private RequestInfo requestInfoTemp; + @Autowired + private CallSrmVenMatExtsSevices service; + private static final Logger logger_336cd654 = LoggerFactory.getLogger(AddVenMatExtsToSrmAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -58,7 +61,9 @@ public class AddVenMatExtsToSrmAction extends BaseBean implements Action, EsbSer // 工作流ID String workFlowId = request.getWorkflowid(); - String tablename = unit.getTablename(workFlowId); +// String tablename = unit.getTablename(workFlowId); + String tablename = request.getRequestManager().getBillTableName(); + logger_336cd654.info("tablename"+tablename); TransUtil tu = new TransUtil(); @@ -124,7 +129,7 @@ public class AddVenMatExtsToSrmAction extends BaseBean implements Action, EsbSer // handleType = "1"; // } } - //TODO custom edit + //TODO custom 获取Lastoperator // checkUser = hr.getResourcename(request.getLastoperator()); checkUser = hr.getResourcename(String.valueOf(userIdTemp)); @@ -211,7 +216,7 @@ public class AddVenMatExtsToSrmAction extends BaseBean implements Action, EsbSer item[j] = itemIn; } oainputvendor.setItems(item); - CallSrmVenMatExtsSevices service = new CallSrmVenMatExtsSevices(); +// CallSrmVenMatExtsSevices service = new CallSrmVenMatExtsSevices(); logger_336cd654.info(requestId + "-------AddVenMatExtsToSrmAction请求数据----" + oainputvendor.toString()); // String[] str = service.call(oainputvendor, requestId); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmCheckAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmCheckAction.java index 474db4f..6e52798 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmCheckAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmCheckAction.java @@ -38,6 +38,9 @@ public class AddVenMatExtsToSrmCheckAction extends BaseBean implements Action, E @Autowired private RequestInfo requestInfoTemp; + @Autowired + private CallSrmVenMatExtsSevices service; + private static final Logger logger_81b57400 = LoggerFactory.getLogger(AddVenMatExtsToSrmCheckAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -50,7 +53,8 @@ public class AddVenMatExtsToSrmCheckAction extends BaseBean implements Action, E String requestId = request.getRequestid(); TransUtil tu = new TransUtil(); String workflowid = request.getWorkflowid(); - String tablename = tu.getTableName(workflowid); +// String tablename = tu.getTableName(workflowid); + String tablename = request.getRequestManager().getBillTableName(); try { // 公司名字 String companyName = ""; @@ -197,7 +201,7 @@ public class AddVenMatExtsToSrmCheckAction extends BaseBean implements Action, E item[j] = itemIn; } oainputvendor.setItems(item); - CallSrmVenMatExtsSevices service = new CallSrmVenMatExtsSevices(); +// CallSrmVenMatExtsSevices service = new CallSrmVenMatExtsSevices(); logger_81b57400.info(requestId + "-------AddVenMatExtsToSrmCheckAction请求数据----" + oainputvendor); // String[] str = service.call(oainputvendor, requestId); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BuQianKaAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BuQianKaAction.java index ef2e5e9..721cd1e 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BuQianKaAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BuQianKaAction.java @@ -42,6 +42,8 @@ public class BuQianKaAction extends BaseBean implements Action, EsbServerlessRpc logger_f1f35583.info(String.valueOf("creater:" + creater)); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String createsqlString = "select id from eteams.dbo.employee as hrmresource where lastname ='" + creater + "'"; + logger_f1f35583.info(String.valueOf("createsqlString === " + createsqlString)); + String poolname = CONN_TYPE.hrm.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(createsqlString, poolname); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheAction.java index e1f8861..085c09e 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheAction.java @@ -318,7 +318,7 @@ public class DoTheAction { wri.setWorkflowBaseInfo(wbi); WorkflowServiceImpl WorkflowServicePortTypeProxy = I18nContextUtil.getBean(WorkflowServiceImpl.class); // TODO 方法参数:1 类型发生变化 e9类型:int e10类型:Long -// TODO config +// TODO config 管理员id String requestid = WorkflowServicePortTypeProxy.doCreateWorkflowRequest(wri, 1046285013082546176L); logger_7213d31d.info("流程触发：" + requestid); } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheActionNew.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheActionNew.java index ef45adb..0a2cdda 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheActionNew.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheActionNew.java @@ -362,7 +362,7 @@ public class DoTheActionNew { wri.setWorkflowBaseInfo(wbi); WorkflowServiceImpl WorkflowServicePortTypeProxy = I18nContextUtil.getBean(WorkflowServiceImpl.class); // TODO 方法参数:1 类型发生变化 e9类型:int e10类型:Long - //TODO config + //TODO config 管理员id // String requestid = WorkflowServicePortTypeProxy.doCreateWorkflowRequest(wri, 1); String requestid = WorkflowServicePortTypeProxy.doCreateWorkflowRequest(wri, 1046285013082546176L); logger_5105ad43.info("流程触发：" + requestid); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/K3PORequestAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/K3PORequestAction.java index b6ec109..0ddf7e3 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/K3PORequestAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/K3PORequestAction.java @@ -69,7 +69,8 @@ public class K3PORequestAction extends BaseBean implements Action, EsbServerless TransUtil tu = new TransUtil(); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String workflowID = requestInfo.getWorkflowid(); - String tableName = tu.getTableName(workflowID); +// String tableName = tu.getTableName(workflowID); + String tableName = requestInfo.getRequestManager().getBillTableName(); logger_7396c45f.info(String.valueOf("K3PORequestAction--start--" + requestID)); Map mMap = new HashMap(); for (int i = 0; i < properties.length; i++) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/LastOperateAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/LastOperateAction.java index 244fee5..62b3a27 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/LastOperateAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/LastOperateAction.java @@ -63,7 +63,9 @@ public class LastOperateAction extends BaseBean implements Action, EsbServerless String workflowid = request.getWorkflowid(); // 获取审批人姓名 String spr = hr.getResourcename(request.getLastoperator()); - String tablename = wkbl.getTablename(wkfl.getFormId(workflowid)); +// String tablename = wkbl.getTablename(wkfl.getFormId(workflowid)); + String tablename = request.getRequestManager().getBillTableName(); + String logsql = "update " + tablename + " set spr = '" + spr + "' where requestId = " + reid; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorPunishCommitAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorPunishCommitAction.java index 35ac51d..37897e6 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorPunishCommitAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorPunishCommitAction.java @@ -34,6 +34,8 @@ public class OaSrmVendorPunishCommitAction extends BaseBean implements Action, E private static final Logger logger_c3039127 = LoggerFactory.getLogger(OaSrmVendorPunishCommitAction.class); + @Autowired + private SendPostRequest_PO mGetResult ; private String SENDID; private String ITFID; @@ -116,7 +118,7 @@ public class OaSrmVendorPunishCommitAction extends BaseBean implements Action, E // String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htsrmoasync.OaSrmVendorPunish")).trim(); String url = configProp.getOaSrmVendorPunish() ; logger_c3039127.info("调用SRM供应商绩效处罚信息同步接口地址：" + url); - SendPostRequest_PO mGetResult = new SendPostRequest_PO(); +// SendPostRequest_PO mGetResult = new SendPostRequest_PO(); String result = mGetResult.getResult(mReqJson, url); logger_c3039127.info(String.valueOf("调用SRM供应商绩效处罚信息同步接口请求数据：" + result)); if (!("E".equals(result))) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorPunishConfirmAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorPunishConfirmAction.java index 255e964..9befe90 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorPunishConfirmAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorPunishConfirmAction.java @@ -42,6 +42,9 @@ public class OaSrmVendorPunishConfirmAction extends BaseBean implements Action, private String SYSID = "SYS004"; @Autowired private ConfigProp configProp; + + @Autowired + SendPostRequest_PO mGetResult; @Override public WeaResult> execute(Map requestInfoMap) { logger_9131997c.info("OaSrmVendorPunishConfirmAction start"); @@ -135,7 +138,7 @@ public class OaSrmVendorPunishConfirmAction extends BaseBean implements Action, // 调用接口 // String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htsrmoasync.OaSrmVendorPunish")).trim(); String url = configProp.getOaSrmVendorPunish(); - SendPostRequest_PO mGetResult = new SendPostRequest_PO(); +// SendPostRequest_PO mGetResult = new SendPostRequest_PO(); String result = mGetResult.getResult(mReqJson, url); logger_9131997c.info(String.valueOf("调用SRM供应商绩效处罚信息同步接口请求数据：" + result)); if (!"E".equals(result)) { 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 3f836e7..1a18e8e 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 @@ -44,6 +44,9 @@ public class OaSrmVendorQualityConfirmAction extends BaseBean implements Action, private String SYSID = "SYS004"; @Autowired private ConfigProp configProp; + + @Autowired + private SendPostRequest_PO mGetResult; @Override public WeaResult> execute(Map requestInfoMap) { logger_ffadea7c.info("OaSrmVendorQualityConfirmAction start"); @@ -123,7 +126,7 @@ public class OaSrmVendorQualityConfirmAction extends BaseBean implements Action, // 调用接口 // String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htsrmoasync.OaSrmVendorPunish")).trim(); String url = configProp.getOaSrmVendorPunish(); - SendPostRequest_PO mGetResult = new SendPostRequest_PO(); +// SendPostRequest_PO mGetResult = new SendPostRequest_PO(); String result = mGetResult.getResult(mReqJson, url); logger_ffadea7c.info(String.valueOf("SRM系统返回数据：" + result)); if (!"E".equals(result)) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaWmsReturnAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaWmsReturnAction.java index 1532c75..8fb4b08 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaWmsReturnAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaWmsReturnAction.java @@ -48,7 +48,8 @@ public class OaWmsReturnAction extends BaseBean implements Action, EsbServerless String createrid = requestinfo.getCreatorid(); String workflowid = requestinfo.getWorkflowid(); TransUtil tu = new TransUtil(); - String tableName = tu.getTableName(workflowid); +// String tableName = tu.getTableName(workflowid); + String tableName = requestinfo.getRequestManager().getBillTableName(); String[] str = new String[2]; String requestname = requestinfo.getRequestManager().getRequestname(); Property[] properties = requestinfo.getMainTableInfo().getProperty(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateEmailAccountAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateEmailAccountAction.java index 8b4ee83..55e6f7f 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateEmailAccountAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateEmailAccountAction.java @@ -70,7 +70,8 @@ public class OperateEmailAccountAction extends BaseBean implements Action, EsbSe String requestId = request.getRequestid(); String wfid = request.getWorkflowid(); BillFieldUtil bill = new BillFieldUtil(); - String tablename = bill.getTablename(wfid); +// String tablename = bill.getTablename(wfid); + String tablename = request.getRequestManager().getBillTableName(); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String 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 fe56fac..5b2033f 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 @@ -17,7 +17,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.weaver.verupgrade.general.BaseBean; import com.weaver.verupgrade.general.Util; +import org.springframework.stereotype.Component; +@Component public class SendPostRequest_PO extends BaseBean { private static final Logger logger_8469796 = LoggerFactory.getLogger(SendPostRequest_PO.class); @@ -34,10 +36,9 @@ public class SendPostRequest_PO extends BaseBean { 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", "Basic UE9VU0VSOjY1NDMyMQ=="); + logger_8469796.info("getUrl_password--" + configProp.getUrl_password()); + post.setHeader("Authorization", configProp.getUrl_password()); StringEntity entity = new StringEntity(returnJson.toString(), "UTF-8"); post.setEntity(entity); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_BpAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_BpAction.java index 60bda81..fe95e8a 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_BpAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_BpAction.java @@ -54,7 +54,8 @@ public class ZOA_MM_PR_CREATE_BpAction extends BaseBean implements Action, EsbSe RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); try { String workflowid = request.getWorkflowid(); - String tablename = new TransUtil().getTableName(workflowid); +// String tablename = new TransUtil().getTableName(workflowid); + String tablename = request.getRequestManager().getBillTableName(); BaseBean log = new BaseBean(); // 流程请求ID String reid = request.getRequestid(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_FYH_BgAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_FYH_BgAction.java index c018dcf..fe313aa 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_FYH_BgAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_FYH_BgAction.java @@ -54,7 +54,8 @@ public class ZOA_MM_PR_CREATE_FYH_BgAction extends BaseBean implements Action, E RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); try { String workflowid = request.getWorkflowid(); - String tablename = new TransUtil().getTableName(workflowid); +// String tablename = new TransUtil().getTableName(workflowid); + String tablename = request.getRequestManager().getBillTableName(); try { RecordSet rs1 = I18nContextUtil.getBean(RecordSet.class); ResourceComInfo hr = I18nContextUtil.getBean(ResourceComInfo.class); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_FYH_FyAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_FYH_FyAction.java index 34e7abd..d38b98e 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_FYH_FyAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_FYH_FyAction.java @@ -48,7 +48,8 @@ public class ZOA_MM_PR_CREATE_FYH_FyAction extends BaseBean implements Action, E RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); try { String workflowid = request.getWorkflowid(); - String tablename = new TransUtil().getTableName(workflowid); +// String tablename = new TransUtil().getTableName(workflowid); + String tablename = request.getRequestManager().getBillTableName(); try { RecordSet rs1 = I18nContextUtil.getBean(RecordSet.class); ResourceComInfo hr = I18nContextUtil.getBean(ResourceComInfo.class); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_GDZC_ZcAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_GDZC_ZcAction.java index 72bc147..91ddd70 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_GDZC_ZcAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_GDZC_ZcAction.java @@ -51,7 +51,8 @@ public class ZOA_MM_PR_CREATE_GDZC_ZcAction extends BaseBean implements Action, RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); try { String workflowid = request.getWorkflowid(); - String tablename = new TransUtil().getTableName(workflowid); +// String tablename = new TransUtil().getTableName(workflowid); + String tablename = request.getRequestManager().getBillTableName(); try { RecordSet rs1 = I18nContextUtil.getBean(RecordSet.class); ResourceComInfo hr = I18nContextUtil.getBean(ResourceComInfo.class); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_LbAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_LbAction.java index 4aebeca..f363b9b 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_LbAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_LbAction.java @@ -54,7 +54,8 @@ public class ZOA_MM_PR_CREATE_LbAction extends BaseBean implements Action, EsbSe RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); try { String workflowid = request.getWorkflowid(); - String tablename = new TransUtil().getTableName(workflowid); +// String tablename = new TransUtil().getTableName(workflowid); + String tablename = request.getRequestManager().getBillTableName(); try { RecordSet rs1 = I18nContextUtil.getBean(RecordSet.class); ResourceComInfo hr = I18nContextUtil.getBean(ResourceComInfo.class); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_YFFY_ZjAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_YFFY_ZjAction.java index 1ad597f..d269601 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_YFFY_ZjAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_YFFY_ZjAction.java @@ -89,7 +89,8 @@ public class ZOA_MM_PR_CREATE_YFFY_ZjAction extends BaseBean implements Action, String kmlb = "F"; String[][] prdetail = null; int xmh = 0; - String tablename = new TransUtil().getTableName(workflowid); +// String tablename = new TransUtil().getTableName(workflowid); + String tablename = request.getRequestManager().getBillTableName(); logger_adb00a32.info(String.valueOf("ZOA_MM_PR_CREATE_YFFY_ZjAction start reid--" + reid)); // spr = hr.getResourcename(request.getLastoperator());//获取审批人姓名 // 获取表单主字段信息