diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BY_EnterToJhrwMx.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BY_EnterToJhrwMx.java index 89f0040..0115dec 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BY_EnterToJhrwMx.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BY_EnterToJhrwMx.java @@ -116,10 +116,12 @@ public class BY_EnterToJhrwMx implements Action, EsbServerlessRpcRemoteInterface logger_b053f378.info("sql1:" + sql1); String poolname_m7 = CONN_TYPE.ebuilder.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs1.executeSql(sql1, poolname_m7); + boolean b2 = rs1.executeSql(sql1, poolname_m7); + logger_b053f378.info("b2:" + b2); String poolname_p1 = CONN_TYPE.ebuilder.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs3.executeSql("delete from e10_common.dbo.mission_change where id=" + glid, poolname_p1); + boolean b3 = rs3.executeSql("delete from e10_common.dbo.mission_change where id=" + glid, poolname_p1); + logger_b053f378.info("b3:" + b3); // String poolname_in = CONN_TYPE.ebuilder.getType(); // /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChangeInformationExpertsAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChangeInformationExpertsAction.java index 4928000..4ed7d9d 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChangeInformationExpertsAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChangeInformationExpertsAction.java @@ -62,7 +62,8 @@ public class ChangeInformationExpertsAction extends BaseBean implements Action, String sql = "select * from e10_core_business.dbo." + tablename + " where requestid=" + requestid; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b2 = rs.executeSql(sql, poolname); + logger_750b7a22.info("b2--" + b2); if (rs.next()) { zjlx1 = Util.null2String(rs.getString("zjlx1")); sqdw = Util.null2String(rs.getString("sqdw")); @@ -72,11 +73,12 @@ public class ChangeInformationExpertsAction extends BaseBean implements Action, } String xxhzj = ""; String xxhzjrdgcl = ""; - sql = "SELECT xxhzj AS xxhzj, xxhzjrdgcl AS xxhzjrdgclFROM (SELECT t1.*, t2.id AS subcomid FROM eteams.dbo.hrmsubcompanydefined t1 LEFT JOIN eteams.dbo.department t2 ON t1.FORM_DATA_ID = t2.formdata AND t2.delete_type = 0 AND t2.tenant_key = 't6kj9c07jr' WHERE t1.DELETE_TYPE = 0 AND t1.TENANT_KEY = 't6kj9c07jr') HrmSubcompanyDefinedWHERE HrmSubcompanyDefined.delete_type = 0 AND HrmSubcompanyDefined.tenant_key = 't6kj9c07jr' and subcomid = '" + sqdw +"'"; + sql = "SELECT xxhzj AS xxhzj, xxhzjrdgcl AS xxhzjrdgcl FROM (SELECT t1.*, t2.id AS subcomid FROM eteams.dbo.hrmsubcompanydefined t1 LEFT JOIN eteams.dbo.department t2 ON t1.FORM_DATA_ID = t2.formdata AND t2.delete_type = 0 AND t2.tenant_key = 't6kj9c07jr' WHERE t1.DELETE_TYPE = 0 AND t1.TENANT_KEY = 't6kj9c07jr') HrmSubcompanyDefinedWHERE HrmSubcompanyDefined.delete_type = 0 AND HrmSubcompanyDefined.tenant_key = 't6kj9c07jr' and subcomid = '" + sqdw +"'"; String poolname_cq = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 logger_750b7a22.info("sql--" + sql); - rs.executeSql(sql, poolname_cq); + boolean b3 = rs.executeSql(sql, poolname_cq); + logger_750b7a22.info("b3--" + b3); if (rs.next()) { xxhzj = Util.null2String(rs.getString("xxhzj")); xxhzjrdgcl = Util.null2String(rs.getString("xxhzjrdgcl")); @@ -106,7 +108,8 @@ public class ChangeInformationExpertsAction extends BaseBean implements Action, str = "新增"; String poolname_jn = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select user_id from eteams.dbo.auth_user_role as HrmRoleMembers where roleid=" + roleid + " and resourceid=" + xm, poolname_jn); + boolean b = rs.executeSql("select user_id from eteams.dbo.auth_user_role as HrmRoleMembers where roleid=" + roleid + " and resourceid=" + xm, poolname_jn); + logger_750b7a22.info("b--" + b); if (!rs.next()) { String poolname_k7 = CONN_TYPE.workflow.getType(); /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 @@ -139,7 +142,8 @@ public class ChangeInformationExpertsAction extends BaseBean implements Action, str = "删除"; String poolname_8p = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("delete from eteams.dbo.HrmRoleMembers where roleid=" + roleid + " and resourceid=" + xm, poolname_8p); + boolean b = rs.executeSql("delete from eteams.dbo.HrmRoleMembers where roleid=" + roleid + " and resourceid=" + xm, poolname_8p); + logger_750b7a22.info("b = " + b); if ("0".equals(zjlx1)) { if (("," + xxhzj + ",").indexOf("," + xm + ",") >= 0) { xxhzj = ("," + xxhzj + ",").replace(("," + xm + ","), ","); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CheckEmailAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CheckEmailAction.java index 22bd201..336e5e9 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CheckEmailAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CheckEmailAction.java @@ -115,7 +115,8 @@ public class CheckEmailAction extends BaseBean implements Action, EsbServerlessR RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b = rs.executeSql(sql, poolname); + logger_48219209.info("b--"+b); if (rs.next()) { num = rs.getInt("count"); } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CheckSystemAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CheckSystemAction.java index 08adc4a..bed112e 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CheckSystemAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CheckSystemAction.java @@ -76,7 +76,8 @@ public class CheckSystemAction extends BaseBean implements Action, EsbServerless RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b = rs.executeSql(sql, poolname); + logger_b4155f0e.info("b--"+b); if (rs.next()) { num = rs.getInt("count"); } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChuChaiShenQingNewAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChuChaiShenQingNewAction.java index 95627e1..b984b4b 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChuChaiShenQingNewAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChuChaiShenQingNewAction.java @@ -182,7 +182,8 @@ public class ChuChaiShenQingNewAction extends BaseBean implements Action, EsbSer CODE = ""; String poolname_lv = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select job_num from eteams.dbo.employee as HrmResource where id = " + aa[i], poolname_lv); + boolean b = rs.executeSql("select job_num from eteams.dbo.employee as HrmResource where id = " + aa[i], poolname_lv); + logger_fee0cda9.info("b--"+b); if (rs.next()) { CODE = Util.null2String(rs.getString("workcode")); jo = new JSONObject(); @@ -247,7 +248,7 @@ public class ChuChaiShenQingNewAction extends BaseBean implements Action, EsbSer SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser(); Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId1, currentEmployee); String poolname1 = CONN_TYPE.workflow.getType(); - String sql = "update e10_common.dbo.sync_eas_log set requestId = '" + requestid + "',gh = '',lbbh='A11',kssj='" + beginDateTime + "',jssj='" + endDateTime + "',message='" + str + "',state='" + hrstate + "',qjss='" + QJSS + "' where id = " + recodId; + String sql = "update e10_common.dbo.chuchai_qingjia_log set requestId = '" + requestid + "',gh = '',lbbh='A11',kssj='" + beginDateTime + "',jssj='" + endDateTime + "',message='" + str + "',state='" + hrstate + "',qjss='" + QJSS + "' where id = " + recodId; boolean b1 = rs.executeSql(sql, poolname1); logger_fee0cda9.info(String.valueOf("sql2:" + sql)); logger_fee0cda9.info(String.valueOf("b1:" + b1)); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DeleteSapGuidAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DeleteSapGuidAction.java index 57a2a8d..38b689e 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DeleteSapGuidAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DeleteSapGuidAction.java @@ -91,7 +91,8 @@ public class DeleteSapGuidAction extends BaseBean implements Action, EsbServerle logger_5b06e417.info(String.valueOf((new StringBuilder()).append("logsql:").append(sql).toString())); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b = rs.executeSql(sql, poolname); + logger_5b06e417.info(String.valueOf("b2 -----"+ b)); } catch (Exception e) { logger_5b06e417.info(String.valueOf(e.getMessage())); request.getRequestManager().setMessageid("ERROR"); 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 41cfe5d..9b8cc8e 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 @@ -77,12 +77,14 @@ public class DoTheAction { if (!"".equals(xgzrw)) { String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update JhrwMx set gzrw='" + xgzrw + "' where mxid=" + mxid, poolname); + boolean b = rs.executeSql("update e10_common.dbo.JhrwMx set gzrw='" + xgzrw + "' where mxid=" + mxid, poolname); + logger_7213d31d.info("b--"+b); } if (!"".equals(xzrr)) { String poolname_i5 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update JhrwMx set zrr='" + xzrr + "' where mxid=" + mxid, poolname_i5); + boolean b = rs.executeSql("update e10_common.dbo.JhrwMx set zrr='" + xzrr + "' where mxid=" + mxid, poolname_i5); + logger_7213d31d.info("b--"+b); } } gdzt = "执行中"; @@ -101,11 +103,13 @@ public class DoTheAction { if (!"".equals(mxid)) { String poolname_w5 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update JhrwMx set rwzt='已取消' where mxid=" + mxid, poolname_w5); + boolean b = rs.executeSql("update e10_common.dbo.JhrwMx set rwzt='已取消' where mxid=" + mxid, poolname_w5); + logger_7213d31d.info("b--"+b); jhrwDate("qxjsrq", mxid); String poolname_zj = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select qxsqrq,qxjsrq from Jhrwmx where mxid='" + mxid + "'", poolname_zj); + boolean b1 = rs.executeSql("select qxsqrq,qxjsrq from e10_common.dbo.Jhrwmx where mxid='" + mxid + "'", poolname_zj); + logger_7213d31d.info("b1--"+b1); if (rs.next()) { String ksrq = Util.null2String(rs.getString("qxsqrq")); String jsrq = Util.null2String(rs.getString("qxjsrq")); @@ -119,7 +123,8 @@ public class DoTheAction { } else if (actionType == 3) { String poolname_dp = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update JhrwMx set qxjsrq='',qxsqrq='' where mxid=" + mxid, poolname_dp); + boolean b = rs.executeSql("update e10_common.dbo.JhrwMx set qxjsrq='',qxsqrq='' where mxid=" + mxid, poolname_dp); + logger_7213d31d.info("b--"+b); thzt = "执行中"; } fklx = "取消申请"; @@ -129,7 +134,8 @@ public class DoTheAction { if (!"".equals(mxid)) { String poolname_u7 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update JhrwMx set rwzt='执行中',wcjsrq='',wcsqrq='' where mxid=" + mxid, poolname_u7); + boolean b = rs.executeSql("update e10_common.dbo.JhrwMx set rwzt='执行中',wcjsrq='',wcsqrq='' where mxid=" + mxid, poolname_u7); + logger_7213d31d.info("b--"+b); } gdzt = "执行中"; } else if (actionType == 3) { @@ -142,27 +148,31 @@ public class DoTheAction { if (!"".equals(mxid)) { String poolname_c1 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update JhrwMx set rwzt='已完成' where mxid=" + mxid, poolname_c1); + boolean b = rs.executeSql("update e10_common.dbo.JhrwMx set rwzt='已完成' where mxid=" + mxid, poolname_c1); + logger_7213d31d.info("b--"+b); jhrwDate("wcjsrq", mxid); String ypid = ""; String poolname_pr = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select pid from JhrwMx where mxid=" + mxid, poolname_pr); + boolean b1 = rs.executeSql("select pid from e10_common.dbo.JhrwMx where mxid=" + mxid, poolname_pr); + logger_7213d31d.info("b1--"+b1); if (rs.next()) { ypid = Util.null2String(rs.getString("pid")); logger_7213d31d.info("ypid：" + ypid); } String poolname_xd = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select count(*) as cnum from JhrwMx where pid=" + ypid, poolname_xd); - String sqlaa = "select count(*) as cnum from JhrwMx where pid=" + ypid; + boolean b2 = rs.executeSql("select count(*) as cnum from e10_common.dbo.JhrwMx where pid=" + ypid, poolname_xd); + logger_7213d31d.info("b2--"+b2); + String sqlaa = "select count(*) as cnum from e10_common.dbo.JhrwMx where pid=" + ypid; logger_7213d31d.info("sqlaa：" + sqlaa); if (rs.next()) { logger_7213d31d.info("cnum：" + rs.getString("cnum")); if (Util.getIntValue(rs.getString("cnum")) == 1) { String poolname_ro = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select rwlx,rwjb from JhrwMx where pid=" + ypid, poolname_ro); + boolean b3 = rs.executeSql("select rwlx,rwjb from e10_common.dbo.JhrwMx where pid=" + ypid, poolname_ro); + logger_7213d31d.info("b3--"+b3); if (rs.next()) { String rwlx = rs.getString("rwlx"); String rwjb = rs.getString("rwjb"); @@ -182,7 +192,8 @@ public class DoTheAction { thzt = "执行中"; String poolname_jh = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update JhrwMx set wcjsrq='',wcsqrq='' where mxid='" + mxid + "' ", poolname_jh); + boolean b = rs.executeSql("update e10_common.dbo.JhrwMx set wcjsrq='',wcsqrq='' where mxid='" + mxid + "' ", poolname_jh); + logger_7213d31d.info("b--"+b); } fklx = "结案申请"; }else if(workflowid.equals("100003460000001112")){ @@ -192,7 +203,8 @@ public class DoTheAction { if (!"".equals(mxid)) { String poolname_91 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update JhrwMx set yqrq='" + xyqrq + "' where mxid=" + mxid, poolname_91); + boolean b = rs.executeSql("update e10_common.dbo.JhrwMx set yqrq='" + xyqrq + "' where mxid=" + mxid, poolname_91); + logger_7213d31d.info("b--"+b); } jhrwDate("yqjsrq", mxid); gdzt = "执行中"; @@ -202,7 +214,8 @@ public class DoTheAction { } else if (actionType == 3) { String poolname_hu = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update JhrwMx set yqsqrq='',yqjsrq='' where mxid='" + mxid + "' ", poolname_hu); + boolean b = rs.executeSql("update e10_common.dbo.JhrwMx set yqsqrq='',yqjsrq='' where mxid='" + mxid + "' ", poolname_hu); + logger_7213d31d.info("b--"+b); thzt = "执行中"; } fklx = "延期申请"; @@ -211,15 +224,18 @@ public class DoTheAction { if (actionType == 2) { String poolname_nz = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update JhrwMx set rwzt='" + gdzt + "' where mxid=" + mxid, poolname_nz); + boolean b = rs.executeSql("update e10_common.dbo.JhrwMx set rwzt='" + gdzt + "' where mxid=" + mxid, poolname_nz); + logger_7213d31d.info("b--"+b); } else if (actionType == 1) { String poolname_qs = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update JhrwMx set rwzt='" + tjzt + "' where mxid=" + mxid, poolname_qs); + boolean b = rs.executeSql("update e10_common.dbo.JhrwMx set rwzt='" + tjzt + "' where mxid=" + mxid, poolname_qs); + logger_7213d31d.info("b--"+b); } else if (actionType == 3) { String poolname_s9 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update JhrwMx set rwzt='" + thzt + "' where mxid=" + mxid, poolname_s9); + boolean b = rs.executeSql("update e10_common.dbo.JhrwMx set rwzt='" + thzt + "' where mxid=" + mxid, poolname_s9); + logger_7213d31d.info("b--"+b); } yjxr(mainMap, workflowid, fklx, paramRequestInfo); } @@ -230,10 +246,11 @@ public class DoTheAction { WorkflowRequestTableField[] wrti = new WorkflowRequestTableField[16]; Map map = new HashMap(); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "select * from jhrwmx where mxid=" + mxid; + String sql = "select * from e10_common.dbo.jhrwmx where mxid=" + mxid; String poolname_ji = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_ji); + boolean b = rs.executeSql(sql, poolname_ji); + logger_7213d31d.info("b--"+b); if (rs.next()) { String[] names = rs.getColumnName(); for (String name : names) { @@ -338,15 +355,17 @@ public class DoTheAction { public void qxRw(String mxid, String ksrq, String jsrq) { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); RecordSet rs1 = I18nContextUtil.getBean(RecordSet.class); - String sql = "select mxid from jhrwmx where pid='" + mxid + "'"; + String sql = "select mxid from e10_common.dbo.jhrwmx where pid='" + mxid + "'"; String poolname_yg = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_yg); + boolean b = rs.executeSql(sql, poolname_yg); + logger_7213d31d.info("b--" + b); while (rs.next()) { String mxid2 = Util.null2String(rs.getString("mxid")); String poolname_xq = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs1.executeSql("update JhrwMx set rwzt='已取消',yqsqrq='" + ksrq + "',yqjsrq='" + jsrq + "' where mxid='" + mxid2 + "' ", poolname_xq); + boolean b1 = rs1.executeSql("update e10_common.dbo.JhrwMx set rwzt='已取消',yqsqrq='" + ksrq + "',yqjsrq='" + jsrq + "' where mxid='" + mxid2 + "' ", poolname_xq); + logger_7213d31d.info("b1--" + b1); qxRw(mxid2, ksrq, jsrq); } } @@ -358,7 +377,8 @@ public class DoTheAction { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname_17 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update JhrwMx set " + zd + "='" + nowDateStr + "' where mxid='" + mxid + "' ", poolname_17); + boolean b = rs.executeSql("update e10_common.dbo.JhrwMx set " + zd + "='" + nowDateStr + "' where mxid='" + mxid + "' ", poolname_17); + logger_7213d31d.info("b--" + b); } public void yjxr(Map mainMap, String workflowid, String fklx, RequestInfo paramRequestInfo) throws Exception { @@ -409,10 +429,11 @@ public class DoTheAction { SET_WD_QX(fjid, mxid); } } - String sql = "select id from By_Worktaskfankui where worktaskid='" + mxid + "' and requestid = '" + requestid + "' and title like '" + fklx + "'"; + String sql = "select id from e10_common.dbo.By_Worktaskfankui where worktaskid='" + mxid + "' and requestid = '" + requestid + "' and title like '" + fklx + "'"; String poolname_ym = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs1.executeSql(sql, poolname_ym); + boolean b = rs1.executeSql(sql, poolname_ym); + logger_7213d31d.info("b--" + b); logger_7213d31d.info("sql:" + sql); if (!rs1.next()) { xrfksj(mainMap, fklx, paramRequestInfo); @@ -427,7 +448,8 @@ public class DoTheAction { String sql2 = "select remark,annexdocids,operatedatetime,operatetime,creator from wfc_requestlog as workflow_requestlog where remark is not null and requestid='" + requestid + "'"; String poolname_7x = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs1.executeSql(sql2, poolname_7x); + boolean b = rs1.executeSql(sql2, poolname_7x); + logger_7213d31d.info("b:" + b); while (rs1.next()) { String remark = Util.null2String(rs1.getString("remark")); remark = remark.replace(" ", ""); @@ -513,7 +535,8 @@ public class DoTheAction { String sql1 = "with temp (id,pid,zrr,phr,ddr,qrr,csr,tbr) as ( select id,pid,zrr,phr,ddr,qrr,csr,tbr from jhrwmx where id = " + worktaskid + " union all select a.id,a.pid,a.zrr,a.phr,a.ddr,a.qrr,a.csr,a.tbr from jhrwmx a inner join temp on a.id = temp.pid)" + " select (cast(zrr as varchar) + ','+ cast(phr as varchar) + ',' + cast(ddr as varchar) + ',' + cast(qrr as varchar) + ',' + cast(csr as varchar) + ',' + cast(tbr as varchar)) as ryid from temp "; String poolname_5q = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql1, poolname_5q); + boolean b = rs.executeSql(sql1, poolname_5q); + logger_7213d31d.info("b:" + b); logger_7213d31d.info("sql1:" + sql1); while (rs.next()) { ryid = ryid + Util.null2String(rs.getString("ryid")) + ","; @@ -589,9 +612,10 @@ public class DoTheAction { Calendar cal = Calendar.getInstance(); String currDate = Util.add0(cal.get(1), 4) + "-" + Util.add0(cal.get(2) + 1, 2) + "-" + Util.add0(cal.get(5), 2); String currTime = Util.add0(cal.getTime().getHours(), 2) + ":" + Util.add0(cal.getTime().getMinutes(), 2); - String sql1 = "update By_Worktaskfankui set begindate='" + currDate + "'," + "Begintime='" + currTime + "'," + "description='" + fksm + "'," + "fj='" + fj + "' " + " where id='" + id + "'"; + String sql1 = "update e10_common.dbo.By_Worktaskfankui set begindate='" + currDate + "'," + "Begintime='" + currTime + "'," + "description='" + fksm + "'," + "fj='" + fj + "' " + " where id='" + id + "'"; String poolname_yj = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql1, poolname_yj); + boolean b = rs.executeSql(sql1, poolname_yj); + logger_7213d31d.info("b:" + b); } } 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 b1771b0..0f8d634 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 @@ -73,12 +73,14 @@ public class DoTheActionNew { if (!"".equals(xgzrw)) { String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update uf_plantask set gzrw='" + xgzrw + "' where id=" + mxid, poolname); + boolean b = rs.executeSql("update e10_common.dbo.uf_plantask set gzrw='" + xgzrw + "' where id=" + mxid, poolname); + logger_5105ad43.info("b--"+b); } if (!"".equals(xzrr)) { String poolname_1d = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update uf_plantask set zrr='" + xzrr + "' where id=" + mxid, poolname_1d); + boolean b = rs.executeSql("update e10_common.dbo.uf_plantask set zrr='" + xzrr + "' where id=" + mxid, poolname_1d); + logger_5105ad43.info("b--"+b); } } gdzt = "执行中"; @@ -123,18 +125,19 @@ public class DoTheActionNew { Long uf_CustomFlow_formId = commonDevUtil.getObjId("By_Worktaskfankui"); logger_5105ad43.info("uf_CustomFlow_formId = " + uf_CustomFlow_formId); Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee); - String sql = "update 10_common.dbo.uf_zqjhrqfkxx set requestId='" + array[0]+"',fksm='"+ array[1]+"',fj='"+ array[2]+"',fkrq='"+ array[3]+"',pid='"+ array[4]+"',zrr='"+ array[5]+"',ddr='"+ array[6]+"',csr='"+ array[7]+"',phr='"+ array[8]+"',qrr='"+ array[9]+"',formmodeid='97',modedatacreater='"+array[10]+"' where id = " + recodId + " and delete_type = 0 "; + String sql = "update e10_common.dbo.uf_zqjhrqfkxx set requestId='" + array[0]+"',fksm='"+ array[1]+"',fj='"+ array[2]+"',fkrq='"+ array[3]+"',pid='"+ array[4]+"',zrr='"+ array[5]+"',ddr='"+ array[6]+"',csr='"+ array[7]+"',phr='"+ array[8]+"',qrr='"+ array[9]+"',formmodeid='97',modedatacreater='"+array[10]+"' where id = " + recodId + " and delete_type = 0 "; boolean b = rs.executeSql(sql, poolname); if (b) { logger_5105ad43.info("添加反馈信息成功"); } else { logger_5105ad43.info("添加反馈信息失败"); } - String sql2 = "select * from uf_zqjhrqfkxx where pid = " + mxid; + String sql2 = "select * from e10_common.dbo.uf_zqjhrqfkxx where pid = " + mxid; RecordSet rs3 = I18nContextUtil.getBean(RecordSet.class); ModeRightInfo info = I18nContextUtil.getBean(ModeRightInfo.class); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs3.executeSql(sql2, poolname); + boolean b1 = rs3.executeSql(sql2, poolname); + logger_5105ad43.info("b1--"+b1); while (rs3.next()) { // id //TODO custom 已处理 类型转换 @@ -157,11 +160,13 @@ public class DoTheActionNew { if (!"".equals(mxid)) { String poolname_6k = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update uf_plantask set rwzt='已取消' where id=" + mxid, poolname_6k); + boolean b2 = rs.executeSql("update e10_common.dbo.uf_plantask set rwzt='已取消' where id=" + mxid, poolname_6k); + logger_5105ad43.info("b2--"+b2); jhrwDate("qxjsrq", mxid); String poolname_mz = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select qxsqrq,qxjsrq from uf_plantask where id='" + mxid + "'", poolname_mz); + boolean b3 = rs.executeSql("select qxsqrq,qxjsrq from e10_common.dbo.uf_plantask where id='" + mxid + "'", poolname_mz); + logger_5105ad43.info("b3--"+b3); if (rs.next()) { String ksrq = Util.null2String(rs.getString("qxsqrq")); String jsrq = Util.null2String(rs.getString("qxjsrq")); @@ -175,7 +180,8 @@ public class DoTheActionNew { } else if (actionType == 3) { String poolname_2z = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update uf_plantask set qxjsrq='',qxsqrq='' where id=" + mxid, poolname_2z); + boolean b2 = rs.executeSql("update e10_common.dbo.uf_plantask set qxjsrq='',qxsqrq='' where id=" + mxid, poolname_2z); + logger_5105ad43.info("b2--"+b2); thzt = "执行中"; } fklx = "取消申请"; @@ -186,7 +192,8 @@ public class DoTheActionNew { if (!"".equals(mxid)) { String poolname_og = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update uf_plantask set rwzt='执行中',wcjsrq='',wcsqrq='' where id=" + mxid, poolname_og); + boolean b2 = rs.executeSql("update e10_common.dbo.uf_plantask set rwzt='执行中',wcjsrq='',wcsqrq='' where id=" + mxid, poolname_og); + logger_5105ad43.info("b2--"+b2); } gdzt = "执行中"; } else if (actionType == 3) { @@ -200,27 +207,31 @@ public class DoTheActionNew { if (!"".equals(mxid)) { String poolname_nf = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update uf_plantask set rwzt='已完成' where id=" + mxid, poolname_nf); + boolean b2 = rs.executeSql("update e10_common.dbo.uf_plantask set rwzt='已完成' where id=" + mxid, poolname_nf); + logger_5105ad43.info("b2--"+b2); jhrwDate("wcjsrq", mxid); String ypid = ""; String poolname_ml = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select pid from uf_plantask where id=" + mxid, poolname_ml); + boolean b3 = rs.executeSql("select pid from e10_common.dbo.uf_plantask where id=" + mxid, poolname_ml); + logger_5105ad43.info("b3--"+b3); if (rs.next()) { ypid = Util.null2String(rs.getString("pid")); logger_5105ad43.info("ypid：" + ypid); } - String sqlaa = "select count(*) as cnum from uf_plantask where pid=" + ypid; + String sqlaa = "select count(*) as cnum from e10_common.dbo.uf_plantask where pid=" + ypid; String poolname_bj = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sqlaa, poolname_bj); + boolean b4 = rs.executeSql(sqlaa, poolname_bj); + logger_5105ad43.info("b4--"+b4); logger_5105ad43.info("sqlaa：" + sqlaa); if (rs.next()) { logger_5105ad43.info("cnum：" + rs.getString("cnum")); if (Util.getIntValue(rs.getString("cnum")) == 1) { String poolname_vc = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select rwlx,rwjb from uf_plantask where pid=" + ypid, poolname_vc); + boolean b5 = rs.executeSql("select rwlx,rwjb from e10_common.dbo.uf_plantask where pid=" + ypid, poolname_vc); + logger_5105ad43.info("b5--"+b5); if (rs.next()) { String rwlx = rs.getString("rwlx"); String rwjb = rs.getString("rwjb"); @@ -248,7 +259,8 @@ public class DoTheActionNew { if (!"".equals(mxid)) { String poolname_zl = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update uf_plantask set yqrq='" + xyqrq + "' where id=" + mxid, poolname_zl); + boolean b2 = rs.executeSql("update e10_common.dbo.uf_plantask set yqrq='" + xyqrq + "' where id=" + mxid, poolname_zl); + logger_5105ad43.info("b2--"+b2); } jhrwDate("yqjsrq", mxid); gdzt = "执行中"; @@ -258,7 +270,8 @@ public class DoTheActionNew { } else if (actionType == 3) { String poolname_t8 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update uf_plantask set yqsqrq='',yqjsrq='' where id='" + mxid + "' ", poolname_t8); + boolean b2 = rs.executeSql("update e10_common.dbo.uf_plantask set yqsqrq='',yqjsrq='' where id='" + mxid + "' ", poolname_t8); + logger_5105ad43.info("b2--"+b2); thzt = "执行中"; } fklx = "延期申请"; @@ -266,15 +279,18 @@ public class DoTheActionNew { if (actionType == 2) { String poolname_qa = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update uf_plantask set rwzt='" + gdzt + "' where id=" + mxid, poolname_qa); + boolean b = rs.executeSql("update e10_common.dbo.uf_plantask set rwzt='" + gdzt + "' where id=" + mxid, poolname_qa); + logger_5105ad43.info("b--"+b); } else if (actionType == 1) { String poolname_ef = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update uf_plantask set rwzt='" + tjzt + "' where id=" + mxid, poolname_ef); + boolean b = rs.executeSql("update e10_common.dbo.uf_plantask set rwzt='" + tjzt + "' where id=" + mxid, poolname_ef); + logger_5105ad43.info("b--"+b); } else if (actionType == 3) { String poolname_sr = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update uf_plantask set rwzt='" + thzt + "' where id=" + mxid, poolname_sr); + boolean b = rs.executeSql("update e10_common.dbo.uf_plantask set rwzt='" + thzt + "' where id=" + mxid, poolname_sr); + logger_5105ad43.info("b--"+b); } yjxr(mainMap, workflowid, fklx, paramRequestInfo); } @@ -285,10 +301,11 @@ public class DoTheActionNew { WorkflowRequestTableField[] wrti = new WorkflowRequestTableField[16]; Map map = new HashMap(); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "select * from uf_plantask where id=" + mxid; + String sql = "select * from e10_common.dbo.uf_plantask where id=" + mxid; String poolname_fv = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_fv); + boolean b = rs.executeSql(sql, poolname_fv); + logger_5105ad43.info("b--"+b); if (rs.next()) { String[] names = rs.getColumnName(); for (String name : names) { @@ -394,15 +411,17 @@ public class DoTheActionNew { public void qxRw(String mxid, String ksrq, String jsrq) { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); RecordSet rs1 = I18nContextUtil.getBean(RecordSet.class); - String sql = "select mxid from uf_plantask where pid='" + mxid + "'"; + String sql = "select mxid from e10_common.dbo.uf_plantask where pid='" + mxid + "'"; String poolname_2f = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_2f); + boolean b = rs.executeSql(sql, poolname_2f); + logger_5105ad43.info("b--"+b); while (rs.next()) { String mxid2 = Util.null2String(rs.getString("mxid")); String poolname_j2 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs1.executeSql("update uf_plantask set rwzt='已取消',yqsqrq='" + ksrq + "',yqjsrq='" + jsrq + "' where id='" + mxid2 + "' ", poolname_j2); + boolean b1 = rs1.executeSql("update e10_common.dbo.uf_plantask set rwzt='已取消',yqsqrq='" + ksrq + "',yqjsrq='" + jsrq + "' where id='" + mxid2 + "' ", poolname_j2); + logger_5105ad43.info("b1--"+b1); qxRw(mxid2, ksrq, jsrq); } } @@ -414,7 +433,8 @@ public class DoTheActionNew { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname_gd = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update uf_plantask set " + zd + "='" + nowDateStr + "' where id='" + mxid + "' ", poolname_gd); + boolean b = rs.executeSql("update e10_common.dbo.uf_plantask set " + zd + "='" + nowDateStr + "' where id='" + mxid + "' ", poolname_gd); + logger_5105ad43.info("b--" + b); } public void yjxr(Map mainMap, String workflowid, String fklx, RequestInfo paramRequestInfo) throws Exception { @@ -465,10 +485,11 @@ public class DoTheActionNew { SET_WD_QX(fjid, mxid); } } - String sql = "select id from By_Worktaskfankui where worktaskid='" + mxid + "' and requestid = '" + requestid + "' and title like '" + fklx + "'"; + String sql = "select id from e10_common.dbo.By_Worktaskfankui where worktaskid='" + mxid + "' and requestid = '" + requestid + "' and title like '" + fklx + "'"; String poolname_ui = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs1.executeSql(sql, poolname_ui); + boolean b = rs1.executeSql(sql, poolname_ui); + logger_5105ad43.info("b--" + b); logger_5105ad43.info("sql:" + sql); if (!rs1.next()) { xrfksj(mainMap, fklx, paramRequestInfo); @@ -480,10 +501,11 @@ public class DoTheActionNew { RecordSet rs1 = I18nContextUtil.getBean(RecordSet.class); String requestid = paramRequestInfo.getRequestid(); String mxid = Util.null2String((String) mainMap.get("mxid")); - String sql2 = "select remark,annexdocids,operatedatetime,operatetime,creator from wfc_requestlog as workflow_requestlog where remark is not null and requestid='" + requestid + "'"; + String sql2 = "select remark,annexdocids,operatedatetime,operatetime,creator from e10_common.dbo.wfc_requestlog as workflow_requestlog where remark is not null and requestid='" + requestid + "'"; String poolname_84 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs1.executeSql(sql2, poolname_84); + boolean b = rs1.executeSql(sql2, poolname_84); + logger_5105ad43.info("b:" + b); while (rs1.next()) { String remark = Util.null2String(rs1.getString("remark")); remark = remark.replace(" ", ""); @@ -556,7 +578,7 @@ public class DoTheActionNew { Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee); String sql3 = "update e10_common.dbo.By_Worktaskfankui set worktaskid='" + mxid + "',begindate=" + " '" + currDate + "',Begintime=" + " '" + currTime + "',resourceid=" + " '" + paramRequestInfo.getRequestManager().getCreater() + "',description=" + " '" + fksm + "',Createrid=" + " '" + paramRequestInfo.getRequestManager().getCreater() + "',Requestid=" + "'" + requestid + "',fj=" + " '" + fj + "'," + "'" + fklx + "签字意见' " + " where id = " + recodId + " and delete_type = 0 "; boolean b1 = rs.executeSql(sql3, poolname); - logger_5105ad43.info("sql3 = " + sql3); + logger_5105ad43.info("b1 = " + b1); // logger_5105ad43.info("SET_WD_QX:"); if (!fj.equals("")) { SET_WD_QX(fj, mxid); @@ -570,7 +592,8 @@ public class DoTheActionNew { String sql1 = "with temp (id,pid,zrr,phr,ddr,qrr,csr,tbr) as ( select id,pid,zrr,phr,ddr,qrr,csr,tbr from uf_plantask where id = " + worktaskid + " union all select a.id,a.pid,a.zrr,a.phr,a.ddr,a.qrr,a.csr,a.tbr from uf_plantask a inner join temp on a.id = temp.pid)" + " select (cast(zrr as varchar) + ','+ cast(phr as varchar) + ',' + cast(ddr as varchar) + ',' + cast(qrr as varchar) + ',' + cast(csr as varchar) + ',' + cast(tbr as varchar)) as ryid from temp "; String poolname_ab = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql1, poolname_ab); + boolean b = rs.executeSql(sql1, poolname_ab); + logger_5105ad43.info("b:" + b); logger_5105ad43.info("sql1:" + sql1); while (rs.next()) { ryid = ryid + Util.null2String(rs.getString("ryid")) + ","; @@ -645,9 +668,10 @@ public class DoTheActionNew { Calendar cal = Calendar.getInstance(); String currDate = Util.add0(cal.get(1), 4) + "-" + Util.add0(cal.get(2) + 1, 2) + "-" + Util.add0(cal.get(5), 2); String currTime = Util.add0(cal.getTime().getHours(), 2) + ":" + Util.add0(cal.getTime().getMinutes(), 2); - String sql1 = "update By_Worktaskfankui set begindate='" + currDate + "'," + "Begintime='" + currTime + "'," + "description='" + fksm + "'," + "fj='" + fj + "' " + " where id='" + id + "'"; + String sql1 = "update e10_common.dbo.By_Worktaskfankui set begindate='" + currDate + "'," + "Begintime='" + currTime + "'," + "description='" + fksm + "'," + "fj='" + fj + "' " + " where id='" + id + "'"; String poolname_8h = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql1, poolname_8h); + boolean b = rs.executeSql(sql1, poolname_8h); + logger_5105ad43.info("b:" + b); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASIntermediaryCheckAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASIntermediaryCheckAction.java index 2cc63e7..305dc75 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASIntermediaryCheckAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASIntermediaryCheckAction.java @@ -66,7 +66,8 @@ public class EASIntermediaryCheckAction extends BaseBean implements Action, EsbS logger_1e13fc37.info("sql == " + sql ); String poolname_cn = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_cn); + boolean b = rs.executeSql(sql, poolname_cn); + logger_1e13fc37.info("b == " + b ); if (rs.next()) { name = Util.null2String(rs.getString("mc")); yxx = Util.null2String(rs.getString("yxx")); @@ -90,7 +91,8 @@ public class EASIntermediaryCheckAction extends BaseBean implements Action, EsbS logger_1e13fc37.info("check == " + check ); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(check, poolname); + boolean b = rs.executeSql(check, poolname); + logger_1e13fc37.info("b == " + b ); if (rs.next()) { logger_1e13fc37.info(String.valueOf("EASIntermediaryCheckAction：--" + requestid + "该中介机构已备案！")); request.getRequestManager().setMessageid("ERROR"); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASIntermediarySyncAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASIntermediarySyncAction.java index 9d1a9ab..aff3ca2 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASIntermediarySyncAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASIntermediarySyncAction.java @@ -137,7 +137,8 @@ public class EASIntermediarySyncAction extends BaseBean implements Action, EsbSe RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b = rs.executeSql(sql, poolname); + logger_c15112b8.info(String.valueOf("b == "+b)); logger_c15112b8.info(String.valueOf(requestid + "更新财务中介机构模块数据成功")); } logger_c15112b8.info(String.valueOf(requestid + "调用报账系统中介机构同步接口结束")); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasQuerySourceBoeNumAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasQuerySourceBoeNumAction.java index 9d12f87..b71e04a 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasQuerySourceBoeNumAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasQuerySourceBoeNumAction.java @@ -206,7 +206,8 @@ public class EasQuerySourceBoeNumAction extends BaseBean implements Action, EsbS String sql = "select oid from e10_common.dbo.uf_eas_vendor v INNER JOIN uf_eas_company c on v.companyId=c.oid where v.vendorId='" + gysidArray[n] + "'"; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b = rs.executeSql(sql, poolname); + logger_3c7e784f.info(String.valueOf("b:" + b)); String oid = ""; while (rs.next()) { oid = rs.getString("oid"); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasTzlhtSubmitAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasTzlhtSubmitAction.java index fa27a57..aab526e 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasTzlhtSubmitAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasTzlhtSubmitAction.java @@ -487,7 +487,10 @@ public class EasTzlhtSubmitAction extends BaseBean implements Action, EsbServerl RecordSet var3 = I18nContextUtil.getBean(RecordSet.class); String poolname_c3 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - var3.executeSql("select code from eteams.dbo.department as HrmDepartment where id = " + var1, poolname_c3); + boolean b = var3.executeSql("select code from eteams.dbo.department as HrmDepartment where id = " + var1, poolname_c3); + if (!b) { + logger_1cc47ce8.info(String.valueOf("查询部门信息失败！")); + } if (var3.next()) { var2 = Util.null2String(var3.getString("departmentcode")); } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasTzlhtSyncAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasTzlhtSyncAction.java index ac58f9f..df5653f 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasTzlhtSyncAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasTzlhtSyncAction.java @@ -180,10 +180,11 @@ public class EasTzlhtSyncAction extends BaseBean implements Action, EsbServerles if (fileIds != null && fileIds.contains(",")) { String[] idArr = fileIds.split(","); for (int i = 0; i < idArr.length; i++) { - String sql = "select imagefilename from document_main_access as docimagefile where docid = " + idArr[i]; + String sql = "select imagefilename from e10_common.dbo.document_main_access as docimagefile where docid = " + idArr[i]; String poolname_s7 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_s7); + boolean b = rs.executeSql(sql, poolname_s7); + logger_197dffab.info("b--"+b); if (rs.next()) { fileNames = fileNames + Util.null2String(rs.getString("imagefilename")) + ","; } @@ -192,10 +193,11 @@ public class EasTzlhtSyncAction extends BaseBean implements Action, EsbServerles fileNames = fileNames.substring(0, fileNames.lastIndexOf(",")); } } else if (fileIds != null && !fileIds.equals("")) { - String sql = "select imagefilename from document_main_access as docimagefile where docid = " + fileIds; + String sql = "select imagefilename from e10_common.dbo.document_main_access as docimagefile where docid = " + fileIds; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b = rs.executeSql(sql, poolname); + logger_197dffab.info("b--"+b); if (rs.next()) { fileNames = Util.null2String(rs.getString("imagefilename")); } @@ -344,7 +346,10 @@ public class EasTzlhtSyncAction extends BaseBean implements Action, EsbServerles RecordSet var3 = I18nContextUtil.getBean(RecordSet.class); String poolname_kp = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - var3.executeSql("select companycode from e10_common.dbo.uf_eas_company where id = " + var1, poolname_kp); + boolean b = var3.executeSql("select companycode from e10_common.dbo.uf_eas_company where id = " + var1, poolname_kp); + if (!b) { + logger_197dffab.info(String.valueOf("查询公司信息失败！")); + } if (var3.next()) { var2 = Util.null2String(var3.getString("companycode")); } @@ -356,7 +361,10 @@ public class EasTzlhtSyncAction extends BaseBean implements Action, EsbServerles RecordSet var3 = I18nContextUtil.getBean(RecordSet.class); String poolname_vt = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - var3.executeSql("select oid from e10_common.dbo.uf_eas_company where id = " + var1, poolname_vt); + boolean b = var3.executeSql("select oid from e10_common.dbo.uf_eas_company where id = " + var1, poolname_vt); + if (!b) { + logger_197dffab.info(String.valueOf("查询公司信息失败！")); + } if (var3.next()) { var2 = Util.null2String(var3.getString("oid")); } @@ -368,7 +376,10 @@ public class EasTzlhtSyncAction extends BaseBean implements Action, EsbServerles RecordSet var3 = I18nContextUtil.getBean(RecordSet.class); String poolname_jy = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - var3.executeSql("select companyname from e10_common.dbo.uf_eas_company where id = " + var1, poolname_jy); + boolean b = var3.executeSql("select companyname from e10_common.dbo.uf_eas_company where id = " + var1, poolname_jy); + if (!b) { + logger_197dffab.info(String.valueOf("获取公司名称失败！")); + } if (var3.next()) { var2 = Util.null2String(var3.getString("companyname")); } @@ -380,7 +391,10 @@ public class EasTzlhtSyncAction extends BaseBean implements Action, EsbServerles RecordSet var3 = I18nContextUtil.getBean(RecordSet.class); String poolname_bg = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - var3.executeSql("select code from eteams.dbo.department as HrmDepartment where id = " + var1, poolname_bg); + boolean b = var3.executeSql("select code from eteams.dbo.department as HrmDepartment where id = " + var1, poolname_bg); + if (!b) { + logger_197dffab.info(String.valueOf("获取部门代码失败！")); + } if (var3.next()) { var2 = Util.null2String(var3.getString("departmentcode")); } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasWhiteListAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasWhiteListAction.java index c1768f0..185025a 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasWhiteListAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasWhiteListAction.java @@ -55,7 +55,8 @@ public class EasWhiteListAction extends BaseBean implements Action, EsbServerles logger_b5430ca5.info("sql == "+sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b = rs.executeSql(sql, poolname); + logger_b5430ca5.info("b == "+b); while (rs.next()) { id = rs.getInt("id"); logger_b5430ca5.info("id == "+id); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_NonStandardAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_NonStandardAction.java index 1f0e94a..3db8f82 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_NonStandardAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_NonStandardAction.java @@ -97,19 +97,21 @@ public class HTGD_MES_NonStandardAction extends BaseBean implements Action, EsbS String[] ret = service.returnRes(req); if ("E".equals(ret[0])) { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "update " + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where requestId=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where requestId=" + requestId; String poolname_ar = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_ar); + boolean b = rs.executeSql(sql, poolname_ar); + logger_c8d15d65.info("b -----"+ b); } logger_c8d15d65.info(String.valueOf("HTGD_MES_NonStandardAction--" + requestId + "执行结束")); } catch (Exception exception) { logger_c8d15d65.info(String.valueOf("HTGD_MES_NonStandardAction--" + requestId + "执行出错：" + exception.getMessage())); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "update " + tablename + " set state='E',message='" + exception.getMessage() + "' where requestId=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set state='E',message='" + exception.getMessage() + "' where requestId=" + requestId; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b = rs.executeSql(sql, poolname); + logger_c8d15d65.info("b2 -----"+ b); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestInfo.getRequestManager())); } catch (Exception e) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_SC03Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_SC03Action.java index 0ed3168..1ca1174 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_SC03Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_SC03Action.java @@ -85,11 +85,12 @@ public class HTGD_MES_SC03Action extends BaseBean implements Action, EsbServerle JSONObject mjson = new JSONObject(); RecordSet sqbmrs = I18nContextUtil.getBean(RecordSet.class); // 获取申请部门审核记录 - String sql = "select operatedatetime,operatetime,b.username from wfc_requestlog a " + "INNER JOIN employee b on a.creator = b.id " + "where requestid = " + requestId + // 申请部门一级人员 测试环境-19915 正式环境-29618 + String sql = "select operatedatetime,operatetime,b.username from e10_core_business.dbo.wfc_requestlog a " + "INNER JOIN employee b on a.creator = b.id " + "where requestid = " + requestId + // 申请部门一级人员 测试环境-19915 正式环境-29618 " and nodeid = 29618"; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - sqbmrs.executeSql(sql, poolname); + boolean b = sqbmrs.executeSql(sql, poolname); + logger_1ea91e04.info("b -----"+ b); while (sqbmrs.next()) { String date = Util.null2String(sqbmrs.getString("operatedate")); String time = Util.null2String(sqbmrs.getString("operatetime")); @@ -99,11 +100,12 @@ public class HTGD_MES_SC03Action extends BaseBean implements Action, EsbServerle mjson.put("sqbmyj", sqbmyj); } // 获取受理部门审核记录 - String sql_slbm = "select operatedatetime,operatetime,b.username from wfc_requestlog a " + "INNER JOIN employee b on a.creator = b.id " + "where requestid = " + requestId + // 受理部门一级人员 测试环境-19916 正式环境-29619 + String sql_slbm = "select operatedatetime,operatetime,b.username from e10_core_business.dbo.wfc_requestlog a " + "INNER JOIN employee b on a.creator = b.id " + "where requestid = " + requestId + // 受理部门一级人员 测试环境-19916 正式环境-29619 " and nodeid = 29619"; String poolname_dk = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - sqbmrs.executeSql(sql_slbm, poolname_dk); + boolean b1 = sqbmrs.executeSql(sql_slbm, poolname_dk); + logger_1ea91e04.info("b1 -----"+ b1); while (sqbmrs.next()) { String date = Util.null2String(sqbmrs.getString("operatedate")); String time = Util.null2String(sqbmrs.getString("operatetime")); @@ -164,7 +166,8 @@ public class HTGD_MES_SC03Action extends BaseBean implements Action, EsbServerle RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname_ig = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update " + tablename + " set state='E',message='" + ret[1] + "' where requestId=" + requestId, poolname_ig); + boolean b2 = rs.executeSql("update e10_core_business.dbo" + tablename + " set state='E',message='" + ret[1] + "' where requestId=" + requestId, poolname_ig); + logger_1ea91e04.info("b2 -----"+ b2); } } catch (Exception exception) { logger_1ea91e04.info(String.valueOf(requestId + "-HTGD_MES_SC03Action error:" + exception.getMessage())); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_SpeedFixAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_SpeedFixAction.java index 7a56165..6a97598 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_SpeedFixAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_SpeedFixAction.java @@ -120,7 +120,8 @@ public class HTGD_MES_SpeedFixAction extends BaseBean implements Action, EsbServ RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update " + tablename + " set state='E',message='" + ret[1] + "' where requestId=" + requestId, poolname); + boolean b = rs.executeSql("update e10_core_business.dbo." + tablename + " set state='E',message='" + ret[1] + "' where requestId=" + requestId, poolname); + logger_d0d39a5f.info(String.valueOf(requestId + "-HTGD_MES_SpeedFixAction update:" + b)); } } catch (Exception exception) { logger_d0d39a5f.info(String.valueOf(requestId + "-HTGD_MES_SpeedFixAction error:" + exception.getMessage())); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_TDLApproveActivon.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_TDLApproveActivon.java index 7637bbc..8d751fe 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_TDLApproveActivon.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_TDLApproveActivon.java @@ -90,7 +90,12 @@ public class HTGD_MES_TDLApproveActivon extends BaseBean implements Action, EsbS RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update " + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where requestId=" + requestId, poolname); + boolean b = rs.executeSql("update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where requestId=" + requestId, poolname); + if (b) { + logger_674a8052.info(String.valueOf(requestId + "-HTGD_MES_TDLApproveActivon update success")); + } else { + logger_674a8052.info(String.valueOf(requestId + "-HTGD_MES_TDLApproveActivon update fail")); + } } catch (Exception exception) { logger_674a8052.info(String.valueOf(requestId + "-HTGD_MES_TDLApproveActivon error:" + exception.getMessage())); } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_SW_OaBackAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_SW_OaBackAction.java index c17e72a..a1637c6 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_SW_OaBackAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_SW_OaBackAction.java @@ -368,12 +368,13 @@ public class HTGD_SW_OaBackAction extends BaseBean implements Action, EsbServerl String wfid = request.getWorkflowid(); // tablename = unit.getTablename(wfid); tablename = request.getRequestManager().getBillTableName(); - String logsql = "update " + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId; + String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId; logger_e4a191d3.info(String.valueOf("logsql:" + logsql)); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(logsql, poolname); + boolean b = rs.executeSql(logsql, poolname); + logger_e4a191d3.info(String.valueOf("b--" + b)); logger_e4a191d3.info(String.valueOf("HTGD_SW_OaBackAction-Request: " + requestId + "完成")); if (!sta.equals("S")) { request.getRequestManager().setMessageid("100001"); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTWLJiaBanAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTWLJiaBanAction.java index a0dbd05..ae5ac94 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTWLJiaBanAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTWLJiaBanAction.java @@ -95,25 +95,28 @@ public class HTWLJiaBanAction extends BaseBean implements Action, EsbServerlessR RecordSet rsds = I18nContextUtil.getBean(RecordSet.class); if ("0".equals(mGZSD)) { // 白班，根据实际加班开始日期 获取当天最早打卡和最晚打卡 - String sql = "SELECt (SELECT min(AttendanceDateTime) FROM `view_attendance` where AttendanceDate='" + mSJJB_ksrq_X + "' and UserNo='" + gh + "') as time1, " + " (SELECT max(AttendanceDateTime) FROM `view_attendance` where AttendanceDate='" + mSJJB_ksrq_X + "' and UserNo='" + gh + "') as time2"; + String sql = "SELECt (SELECT min(AttendanceDateTime) FROM e10_common.dbo.view_attendance where AttendanceDate='" + mSJJB_ksrq_X + "' and UserNo='" + gh + "') as time1, " + " (SELECT max(AttendanceDateTime) FROM `view_attendance` where AttendanceDate='" + mSJJB_ksrq_X + "' and UserNo='" + gh + "') as time2"; logger_983b20e3.info(String.valueOf("查询打卡记录sql:" + sql)); String poolname_y6 = ""; // TODO E10必须指定poolname数据源 - rsds.executeSql(sql, "onecard"); + boolean b = rsds.executeSql(sql, "onecard"); + logger_983b20e3.info(String.valueOf("查询打卡记录结果:" + b)); } else if ("1".equals(mGZSD)) { // 晚班，根据实际开始日期的最晚打卡时间，根据实际结束日期的最早打卡时间 - String sql = "SELECt (SELECT max(AttendanceDateTime) FROM `view_attendance` where AttendanceDate='" + mSJJB_ksrq_X + "' and UserNo='" + gh + "') as time1, " + " (SELECT min(AttendanceDateTime) FROM `view_attendance` where AttendanceDate='" + mSJJB_jsrq_x + "' and UserNo='" + gh + "') as time2"; + String sql = "SELECt (SELECT max(AttendanceDateTime) FROM e10_common.dbo.view_attendance where AttendanceDate='" + mSJJB_ksrq_X + "' and UserNo='" + gh + "') as time1, " + " (SELECT min(AttendanceDateTime) FROM `view_attendance` where AttendanceDate='" + mSJJB_jsrq_x + "' and UserNo='" + gh + "') as time2"; logger_983b20e3.info(String.valueOf("查询打卡记录sql:" + sql)); String poolname_g7 = ""; // TODO E10必须指定poolname数据源 - rsds.executeSql(sql, "onecard"); + boolean b = rsds.executeSql(sql, "onecard"); + logger_983b20e3.info(String.valueOf("查询打卡记录结果:" + b)); } else { // RecordSetDataSource rsds = new RecordSetDataSource("onecard"); - String sql = "SELECt (SELECT min(AttendanceDateTime) FROM `view_attendance` where AttendanceDate='" + jbrqx + "' and UserNo='" + gh + "' and AttendanceDateTime<'" + jbrq + " 12:00:00" + "') as time1, " + " (SELECT max(AttendanceDateTime) FROM `view_attendance` where AttendanceDate='" + jbrqx + "' and UserNo='" + gh + "' and AttendanceDateTime>'" + jbrq + " 12:00:00" + "') as time2"; + String sql = "SELECt (SELECT min(AttendanceDateTime) FROM e10_common.dbo.view_attendance where AttendanceDate='" + jbrqx + "' and UserNo='" + gh + "' and AttendanceDateTime<'" + jbrq + " 12:00:00" + "') as time1, " + " (SELECT max(AttendanceDateTime) FROM `view_attendance` where AttendanceDate='" + jbrqx + "' and UserNo='" + gh + "' and AttendanceDateTime>'" + jbrq + " 12:00:00" + "') as time2"; logger_983b20e3.info(String.valueOf("查询打卡记录sql:" + sql)); String poolname = ""; // TODO E10必须指定poolname数据源 - rsds.executeSql(sql, "onecard"); + boolean b = rsds.executeSql(sql, "onecard"); + logger_983b20e3.info(String.valueOf("查询打卡记录结果:" + b)); // String swdkjl = "";//上午打卡记录 // String xwdkjl = "";//下午打卡记录 // while (rsds.next()) { @@ -142,7 +145,8 @@ public class HTWLJiaBanAction extends BaseBean implements Action, EsbServerlessR RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname_ux = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update " + tablename + " set jbdtzzdksj='" + swdkjl + "',jbdtzwdksj='" + xwdkjl + "' where requestId=" + requestid, poolname_ux); + boolean b = rs.executeSql("update e10_core_business.dbo." + tablename + " set jbdtzzdksj='" + swdkjl + "',jbdtzwdksj='" + xwdkjl + "' where requestId=" + requestid, poolname_ux); + logger_983b20e3.info(String.valueOf("HTWLJiaBanAction update:" + b)); } else { request.getRequestManager().setMessageid("Error"); request.getRequestManager().setMessagecontent("请在实际加班结束日期次日7点后提交！"); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/Iur_syncProject.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/Iur_syncProject.java index ff0879f..fdf0ccf 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/Iur_syncProject.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/Iur_syncProject.java @@ -75,12 +75,22 @@ public class Iur_syncProject extends BaseBean implements Action, EsbServerlessRp logger_72949ae6.info(String.valueOf(requestid + "--Iur_syncProject--info:[" + result[0] + "|" + result[1] + "]")); String poolname_9l = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update " + tablename + " set status='" + result[0] + "',message='" + result[1] + "' where requestId=" + requestid, poolname_9l); + boolean b = rs.executeSql("update e10_core_business.dbo." + tablename + " set status='" + result[0] + "',message='" + result[1] + "' where requestId=" + requestid, poolname_9l); + if (b) { + logger_72949ae6.info(String.valueOf(requestid + "--Iur_syncProject--update success")); + } else { + logger_72949ae6.info(String.valueOf(requestid + "--Iur_syncProject--update fail")); + } } catch (Exception e) { logger_72949ae6.info(String.valueOf("Iur_syncProject--error:" + e.toString())); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update " + tablename + " set status='E',message='" + e.toString() + "' where requestId=" + requestid, poolname); + boolean b = rs.executeSql("update e10_core_business.dbo." + tablename + " set status='E',message='" + e.toString() + "' where requestId=" + requestid, poolname); + if (b) { + logger_72949ae6.info(String.valueOf(requestid + "--Iur_syncProject--update success")); + } else { + logger_72949ae6.info(String.valueOf(requestid + "--Iur_syncProject--update fail")); + } } logger_72949ae6.info(String.valueOf("Iur_syncProject--end:" + requestid)); return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager())); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/JiaBanCheckAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/JiaBanCheckAction.java index 88c7b86..4b2e5ce 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/JiaBanCheckAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/JiaBanCheckAction.java @@ -65,10 +65,11 @@ public class JiaBanCheckAction extends BaseBean implements Action, EsbServerless SimpleDateFormat __dateMinuteFormatter = new SimpleDateFormat("yyyy-MM-dd HH:mm"); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String result = ""; - String sql = "select t.requestId, t.ksrq+' '+t.kssj as starttime,t.jsrq+' '+t.jssj as endtime from " + tablename + " t where t.requestId != " + id + " and t.xm = " + applicant; + String sql = "select t.requestId, t.ksrq+' '+t.kssj as starttime,t.jsrq+' '+t.jssj as endtime from e10_core_business.dbo." + tablename + " t where t.requestId != " + id + " and t.xm = " + applicant; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b = rs.executeSql(sql, poolname); + logger_f2eef612.info("b -----"+ b); while (rs.next()) { String requestId = Util.null2String(rs.getString("requestId")); String startstr = Util.null2String(rs.getString("starttime")); 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 0ddf7e3..e43d9d8 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 @@ -168,10 +168,11 @@ public class K3PORequestAction extends BaseBean implements Action, EsbServerless String message = response.getMessage(); String cgdddjbh = Util.null2String(response.getFBillNO()); logger_7396c45f.info(String.valueOf(requestID + "result:code:" + code + " result:" + result + " message:" + message + " cgdddjbh:" + cgdddjbh)); - String sql = "update " + tableName + " set cgdddjbh='" + cgdddjbh + "' where requestid=" + requestID; + String sql = "update e10_core_business.dbo." + tableName + " set cgdddjbh='" + cgdddjbh + "' where requestid=" + requestID; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b = rs.executeSql(sql, poolname); + logger_7396c45f.info(String.valueOf("b2 -----"+ b)); logger_7396c45f.info(String.valueOf("调用K3Cloud系统采购流程创建接口返回值" + code + "===" + message)); if (!"1".equals(code)) { requestInfo.getRequestManager().setMessageid("ERROR"); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/KeyUserAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/KeyUserAction.java index 670ea2e..83e9a92 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/KeyUserAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/KeyUserAction.java @@ -124,10 +124,11 @@ public class KeyUserAction extends BaseBean implements Action, EsbServerlessRpcR // 变更 logger_52370ec1.info(String.valueOf("系统关键用户变更申请流程======取消用户[" + ygjyh + "]新增用户[" + xgjyh + "]")); if (!"".equals(ygjyh)) { - String sql = "delete from dbo.HrmRoleMembers where roleid = " + dyjsid + " and resourceid in (" + ygjyh + ")"; + String sql = "delete from e10_common.dbo.HrmRoleMembers where roleid = " + dyjsid + " and resourceid in (" + ygjyh + ")"; String poolname_6f = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_6f); + boolean b = rs.executeSql(sql, poolname_6f); + logger_52370ec1.info("b--"+b); } if (!"".equals(xgjyh)) { String[] array = xgjyh.split(","); @@ -159,7 +160,8 @@ public class KeyUserAction extends BaseBean implements Action, EsbServerlessRpcR String sql = "delete from dbo.HrmRoleMembers where roleid = " + dyjsid + " and resourceid in (" + ygjyh + ")"; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b = rs.executeSql(sql, poolname); + logger_52370ec1.info("b--"+b); } } logger_52370ec1.info(String.valueOf("系统关键用户变更申请成功。。。")); 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 62b3a27..3f82884 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 @@ -66,10 +66,11 @@ public class LastOperateAction extends BaseBean implements Action, EsbServerless // String tablename = wkbl.getTablename(wkfl.getFormId(workflowid)); String tablename = request.getRequestManager().getBillTableName(); - String logsql = "update " + tablename + " set spr = '" + spr + "' where requestId = " + reid; + String logsql = "update e10_core_business.dbo." + tablename + " set spr = '" + spr + "' where requestId = " + reid; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs1.executeSql(logsql, poolname); + boolean b = rs1.executeSql(logsql, poolname); + logger_e95a7685.info(String.valueOf("b--"+b)); logger_e95a7685.info(String.valueOf("start log")); logger_e95a7685.info(String.valueOf("------------------------------------------------------------------------")); logger_e95a7685.info(String.valueOf("LastOperateAction:" + logsql)); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/NeiBuDiaoDongAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/NeiBuDiaoDongAction.java index f994ad5..5f33978 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/NeiBuDiaoDongAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/NeiBuDiaoDongAction.java @@ -77,7 +77,8 @@ public class NeiBuDiaoDongAction implements Action, EsbServerlessRpcRemoteInterf // int departmentId = Util.getIntValue(rs2.getString("id")); /* String creater = rs2.getString("departmentmark") + "_" + rs2.getString("lastname"); TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - rs.executeSql(sql, poolname); + boolean b = rs.executeSql(sql, poolname); + logger_1103b3f3.info("b--" + b); while (rs.next()) { maintable = rs.getString("tablename"); } @@ -124,14 +125,16 @@ public class NeiBuDiaoDongAction implements Action, EsbServerlessRpcRemoteInterf DCBM = value; String poolname_a1 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select code from department as HrmDepartment where id =" + DCBM, poolname_a1); + boolean b1 = rs.executeSql("select code from eteams.dbo.department as HrmDepartment where id =" + DCBM, poolname_a1); + logger_1103b3f3.info("b1--" + b1); rs.next(); OutDept = Util.null2String(rs.getString("departmentcode")); } else if (name.equals("NDCGW2")) { NDCGW2 = value; String poolname_el = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select code from position as HrmJobTitles where id =" + NDCGW2, poolname_el); + boolean b1 = rs.executeSql("select code from e10_common.dbo.position as HrmJobTitles where id =" + NDCGW2, poolname_el); + logger_1103b3f3.info("b1--" + b1); rs.next(); OutPosition = Util.null2String(rs.getString("jobtitlecode")); } else if (name.equals("RGWRQ")) { @@ -141,14 +144,16 @@ public class NeiBuDiaoDongAction implements Action, EsbServerlessRpcRemoteInterf DRBM = value; String poolname_up = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select code from department as HrmDepartment where id =" + DRBM, poolname_up); + boolean b1 = rs.executeSql("select code from eteams.dbo.department as HrmDepartment where id =" + DRBM, poolname_up); + logger_1103b3f3.info("b1--" + b1); rs.next(); InDept = Util.null2String(rs.getString("departmentcode")); } else if (name.equals("DRGW")) { ZW2 = value; String poolname_9p = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select code from position as HrmJobTitles where id =" + ZW2, poolname_9p); + boolean b1 = rs.executeSql("select code from e10_common.dbo.position as HrmJobTitles where id =" + ZW2, poolname_9p); + logger_1103b3f3.info("b1--" + b1); rs.next(); InPosition = Util.null2String(rs.getString("jobtitlecode")); } else if (name.equals("DGRQ")) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/NewBuKaAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/NewBuKaAction.java index ee6076b..3c9b8a2 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/NewBuKaAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/NewBuKaAction.java @@ -57,10 +57,11 @@ public class NewBuKaAction extends BaseBean implements Action, EsbServerlessRpcR String creater = request.getCreatorid(); logger_eae3b780.info(String.valueOf("creater:" + creater)); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String createsqlString = "select id from employee as hrmresource where lastname ='" + creater + "'"; + String createsqlString = "select id from eteams.dbo.employee as hrmresource where lastname ='" + creater + "'"; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(createsqlString, poolname); + boolean b = rs.executeSql(createsqlString, poolname); + logger_eae3b780.info("b--"+b); rs.next(); String createrId = rs.getString("id"); Map mainTableDataMap = new HashMap(); @@ -126,6 +127,7 @@ public class NewBuKaAction extends BaseBean implements Action, EsbServerlessRpcR Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee);// 获取插入的空的建模id String sql = "update e10_common.dbo.buka_log_new set requestid = " + requestid + ",gh = '" + GH + "',punchreason='" + bkyy + "',punchtype='" + kz + "',TimeCardDate='" + qksj + "',TimeCardTime='" + bkrq + " " + bksj + "',createrId='" + createrId + "',BKRQ='" + BKRQ + "' where id = " + recodId + " and delete_type = 0 "; boolean b1 = rs.executeSql(sql, poolname); + logger_eae3b780.info("b1--"+b1); logger_eae3b780.info(String.valueOf("sql1:" + sql)); } logger_eae3b780.info(String.valueOf("NewBuKaAction--end--" + requestid)); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OA_CMZ_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OA_CMZ_Action.java index 94915bf..30e3e37 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OA_CMZ_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OA_CMZ_Action.java @@ -120,12 +120,13 @@ public class OA_CMZ_Action extends BaseBean implements Action, EsbServerlessRpcR BillFieldUtil unit = new BillFieldUtil(); // tablename = unit.getTablename(wfid); tablename = requestinfo.getRequestManager().getBillTableName(); - String logsql = "update " + tablename + " set status ='" + sta + "', message = '" + meg + "' where requestId = " + requestid; + String logsql = "update e10_core_business.dbo." + tablename + " set status ='" + sta + "', message = '" + meg + "' where requestId = " + requestid; logger_44f7fe13.info(String.valueOf("logsql:" + logsql)); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(logsql, poolname); + boolean b = rs.executeSql(logsql, poolname); + logger_44f7fe13.info("b--"+b); logger_44f7fe13.info(String.valueOf("出门证接口调用: " + requestid + "完成")); } catch (Exception e) { System.err.println(e.toString()); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaCrmZDYWFPAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaCrmZDYWFPAction.java index 1452c6e..462cbb1 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaCrmZDYWFPAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaCrmZDYWFPAction.java @@ -129,10 +129,11 @@ public class OaCrmZDYWFPAction extends BaseBean implements Action, EsbServerless requestInfo.getRequestManager().setMessagecontent("CRM返回错误信息：" + srMessage); } else { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "update " + tablename + " set jssqdh='" + goldenNum + "' where requestId=" + requestID; + String sql = "update e10_core_business.dbo." + tablename + " set jssqdh='" + goldenNum + "' where requestId=" + requestID; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b = rs.executeSql(sql, poolname); + logger_afe2c4b5.info(String.valueOf(requestID + "更新数据库：" + b)); logger_afe2c4b5.info(String.valueOf(requestID + "更新数据库成功！")); } } else { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialCertificationAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialCertificationAction.java index fbcf779..bc407a0 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialCertificationAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialCertificationAction.java @@ -523,12 +523,13 @@ public class OaMesNewMaterialCertificationAction extends BaseBean implements Act String wfid = request.getWorkflowid(); // tablename = unit.getTablename(wfid); tablename = request.getRequestManager().getBillTableName(); - String logsql = "update " + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId; + String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId; logger_7ab25493.info(String.valueOf("logsql:" + logsql)); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(logsql, poolname); + boolean b = rs.executeSql(logsql, poolname); + logger_7ab25493.info("b--"+b); logger_7ab25493.info(String.valueOf("CallMesNewMaterialCertificationAction-Request: " + requestId + "完成")); if (!sta.equals("S")) { request.getRequestManager().setMessageid("100001"); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialProjectAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialProjectAction.java index 9b425ad..15f2925 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialProjectAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialProjectAction.java @@ -405,12 +405,13 @@ public class OaMesNewMaterialProjectAction extends BaseBean implements Action, E String wfid = request.getWorkflowid(); // tablename = unit.getTablename(wfid); tablename = request.getRequestManager().getBillTableName(); - String logsql = "update " + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId; + String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId; logger_fedc85f2.info(String.valueOf("logsql:" + logsql)); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(logsql, poolname); + boolean b = rs.executeSql(logsql, poolname); + logger_fedc85f2.info(String.valueOf("logsql:" + logsql + "执行结果：" + b)); logger_fedc85f2.info(String.valueOf("HTGD_SW_OaBackAction-Request: " + requestId + "完成")); if (!sta.equals("S")) { request.getRequestManager().setMessageid("100001"); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialTSBGAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialTSBGAction.java index 606f6ad..2512ba0 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialTSBGAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialTSBGAction.java @@ -439,12 +439,13 @@ public class OaMesNewMaterialTSBGAction extends BaseBean implements Action, EsbS String wfid = request.getWorkflowid(); // tablename = unit.getTablename(wfid); tablename = request.getRequestManager().getBillTableName(); - String logsql = "update " + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId; + String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId; logger_f52b61d7.info(String.valueOf("logsql:" + logsql)); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(logsql, poolname); + boolean b = rs.executeSql(logsql, poolname); + logger_f52b61d7.info("b--"+b); logger_f52b61d7.info(String.valueOf("OaMesNewMaterialTSBGAction-Request: " + requestId + "完成")); if (!sta.equals("S")) { request.getRequestManager().setMessageid("100001"); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialTestAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialTestAction.java index ff9cdae..ccd12a6 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialTestAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialTestAction.java @@ -299,12 +299,13 @@ public class OaMesNewMaterialTestAction extends BaseBean implements Action, EsbS String wfid = request.getWorkflowid(); // tablename = unit.getTablename(wfid); tablename = request.getRequestManager().getBillTableName(); - String logsql = "update " + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId; + String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId; logger_908d3105.info(String.valueOf("logsql:" + logsql)); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(logsql, poolname); + boolean b = rs.executeSql(logsql, poolname); + logger_908d3105.info(String.valueOf("b--"+b)); logger_908d3105.info(String.valueOf("CallMesNewMaterialTestAction-Request: " + requestId + "完成")); if (!sta.equals("S")) { request.getRequestManager().setMessageid("100001"); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckMallApproveAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckMallApproveAction.java index d8464a9..48949ac 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckMallApproveAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckMallApproveAction.java @@ -107,7 +107,8 @@ public class OaSrmCheckMallApproveAction extends BaseBean implements Action, Esb logger_85b99b44.info(String.valueOf(requestId + " logsql:" + logsql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(logsql, poolname); + boolean b = rs.executeSql(logsql, poolname); + logger_85b99b44.info(String.valueOf("b--"+b)); logger_85b99b44.info(String.valueOf("OaSrmCheckMallApproveAction-Request: " + requestId + "完成")); if (!sta.equals("S")) { request.getRequestManager().setMessagecontent("推送SRM失败:" + meg); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckMallRefuseAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckMallRefuseAction.java index 3c3bd58..f1c7ea6 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckMallRefuseAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckMallRefuseAction.java @@ -105,11 +105,12 @@ public class OaSrmCheckMallRefuseAction extends BaseBean implements Action, EsbS String wfid = request.getWorkflowid(); // tablename = unit.getTablename(wfid); tablename = request.getRequestManager().getBillTableName(); - String logsql = "update " + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId; + String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId; logger_6576dfe9.info(String.valueOf(requestId + " logsql:" + logsql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(logsql, poolname); + boolean b = rs.executeSql(logsql, poolname); + logger_6576dfe9.info(String.valueOf("b--"+b)); logger_6576dfe9.info(String.valueOf("OaSrmCheckMallRefuseAction-Request: " + requestId + "完成")); if (!sta.equals("S")) { request.getRequestManager().setMessagecontent("推送SRM失败:" + meg); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckPriceApproveAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckPriceApproveAction.java index c72cde8..3d306f6 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckPriceApproveAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckPriceApproveAction.java @@ -153,7 +153,8 @@ public class OaSrmCheckPriceApproveAction extends BaseBean implements Action, Es logger_c6c5cea5.info(String.valueOf("logsql:" + logsql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(logsql, poolname); + boolean b = rs.executeSql(logsql, poolname); + logger_c6c5cea5.info("b--" + b); logger_c6c5cea5.info(String.valueOf("OaSrmCheckPriceApproveAction-Request: " + requestId + "完成")); if (!sta.equals("S")) { logUtil.setJkzt("1"); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckPriceRefuseAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckPriceRefuseAction.java index 07b8a7a..262211c 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckPriceRefuseAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckPriceRefuseAction.java @@ -146,11 +146,12 @@ public class OaSrmCheckPriceRefuseAction extends BaseBean implements Action, Esb String wfid = request.getWorkflowid(); // tablename = unit.getTablename(wfid); tablename = request.getRequestManager().getBillTableName(); - String logsql = "update " + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId; + String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId; logger_80563c68.info(String.valueOf("logsql:" + logsql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(logsql, poolname); + boolean b = rs.executeSql(logsql, poolname); + logger_80563c68.info(String.valueOf("b:" + b)); logger_80563c68.info(String.valueOf("OaSrmCheckPriceRefuseAction-Request: " + requestId + "完成")); if (!sta.equals("S")) { logUtil.setJkzt("1"); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorAdmitAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorAdmitAction.java index f3a9fa3..12088ee 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorAdmitAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorAdmitAction.java @@ -142,11 +142,12 @@ public class OaSrmVendorAdmitAction extends BaseBean implements Action, EsbServe dlvapplyin.setInspectFlag(xcsh); dlvapplyin.setVendorType(gyslxmc); int dtcount = 0; - String sql = "select b.* from " + tablename + " a," + tablename + "_dt3 b where a.id=b.mainid and a.requestid=" + requestid; + String sql = "select b.* from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + tablename + "_dt3 b where a.form_data_id=b.form_data_id and a.id=" + requestid; logger_9af84826.info("sql-->" + sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b = rs.executeSql(sql, poolname); + logger_9af84826.info("b-->" + b); dtcount = rs.getCounts(); if (dtcount > 0) { int index = 0; diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorCheckAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorCheckAction.java index 05da1d8..7c948a1 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorCheckAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorCheckAction.java @@ -174,10 +174,11 @@ public class OaSrmVendorCheckAction extends BaseBean implements Action, EsbServe dlvapplyin.setInspectFlag(xcsh); dlvapplyin.setVendorType(gyslxmc); int dtcount = 0; - String sql = "select b.* from " + tablename + " a," + tablename + "_dt3 b where a.id=b.mainid and a.requestid=" + requestid; + String sql = "select b.* from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + tablename + "_dt3 b where a.form_data_id=b.form_data_id and a.id=" + requestid; String poolname_6g = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_6g); + boolean b = rs.executeSql(sql, poolname_6g); + logger_a864d799.info(String.valueOf("b--" + b)); dtcount = rs.getCounts(); if (dtcount > 0) { int index = 0; @@ -231,10 +232,11 @@ public class OaSrmVendorCheckAction extends BaseBean implements Action, EsbServe oainputvendor.setShzt("1"); if (val.equals("0")) { int dtcount = 0; - String sql = "select b.* from " + tablename + " a," + tablename + "_dt3 b where a.id=b.mainid and a.requestid=" + requestid; + String sql = "select b.* from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + tablename + "_dt3 b where a.form_data_id=b.form_data_id and a.id=" + requestid; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b = rs.executeSql(sql, poolname); + logger_a864d799.info(String.valueOf("b--" + b)); dtcount = rs.getCounts(); if (dtcount > 0) { int index = 0; @@ -272,11 +274,12 @@ public class OaSrmVendorCheckAction extends BaseBean implements Action, EsbServe List list = new ArrayList(); StringBuilder sb = new StringBuilder(); int dtcount = 0; - String sql = "select distinct wlh from " + tablename + " a," + tablename + "_dt2 b where a.id=b.mainid and a.requestid=" + requestid; + String sql = "select distinct wlh from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + tablename + "_dt2 b where a.form_data_id=b.form_data_id and a.id=" + requestid; logger_a864d799.info("sql-->" + sql); String poolname_4c = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_4c); + boolean b = rs.executeSql(sql, poolname_4c); + logger_a864d799.info(String.valueOf("b--" + b)); dtcount = rs.getCounts(); logger_a864d799.info(String.valueOf(requestid + " dt2count:" + dtcount)); if (sq.length <= 300) { 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 25bee11..c73ace8 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 @@ -146,11 +146,12 @@ public class OaSrmVendorReapplyAction extends BaseBean implements Action, EsbSer oainputvendor.setSyncErp(Integer.valueOf(sftserp)); } int dtcount = 0; - String sql = "select b.* from " + tablename + " a," + tablename + "_dt3 b where a.id=b.mainid and a.requestid=" + requestid; + String sql = "select b.* from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + tablename + "_dt3 b where a.form_data_id=b.form_data_id and a.id=" + requestid; logger_a5e612ac.info("sql-->" + sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b = rs.executeSql(sql, poolname); + logger_a5e612ac.info("b-->" + b); dtcount = rs.getCounts(); if (dtcount > 0) { int index = 0; @@ -225,11 +226,12 @@ 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; + String sql = "select distinct wlh from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + tablename + "_dt2 b where a.form_data_id=b.form_data_id and a.id=" + requestid; logger_a5e612ac.info("sql-->" + sql); String poolname_uh = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_uh); + boolean b = rs.executeSql(sql, poolname_uh); + logger_a5e612ac.info(String.valueOf(requestid + "调用查询接口返回：" + b)); dtcount = rs.getCounts(); logger_a5e612ac.info(String.valueOf(requestid + " dt2count:" + dtcount)); if (sq.length <= 300) { 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 abde014..1a026f2 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 @@ -147,7 +147,8 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer logger_41a64316.info(String.valueOf("sql-->" + sql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b = rs.executeSql(sql, poolname); + logger_41a64316.info(String.valueOf("b-->" + b)); dtcount = rs.getCounts(); if (dtcount > 0) { int index = 0; @@ -223,7 +224,8 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer logger_41a64316.info("sql-->" + sql); String poolname_wk = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_wk); + boolean b = rs.executeSql(sql, poolname_wk); + logger_41a64316.info(String.valueOf("b-->" + b)); dtcount = rs.getCounts(); logger_41a64316.info(String.valueOf(requestid + " dt2count:" + dtcount)); if (sq.length <= 300 && sq.length > 0) { 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 8fb4b08..f93a72a 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 @@ -70,11 +70,12 @@ public class OaWmsReturnAction extends BaseBean implements Action, EsbServerless } // 获取申请人直接上级 String zjsj = ""; - sql = "select (select lastname from employee as hrmresource where id=b.superior) as zjsj from " + tableName + " a,employee b where a.sqr=b.id and a.requestId =" + requestid; + sql = "select (select lastname from eteams.dbo.employee as hrmresource where id=b.superior) as zjsj from e10_core_business.dbo." + tableName + " a,employee b where a.sqr=b.id and a.id =" + requestid; logger_824c0f2.info("sql--" + sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b = rs.executeSql(sql, poolname); + logger_824c0f2.info(String.valueOf("b-->" + b)); if (rs.next()) { zjsj = Util.null2String(rs.getString("zjsj")); } @@ -94,21 +95,23 @@ public class OaWmsReturnAction extends BaseBean implements Action, EsbServerless // ZMES_OA_SUBMIT_SERVICE service = new ZMES_OA_SUBMIT_SERVICE(); str = service.call(param, requestid, cfxt); logger_824c0f2.info(String.valueOf(requestid + "--OaWmsReturnAction--result:" + str[0] + "-" + str[1])); - sql = "update " + tableName + " set state='" + str[0] + "',message='" + str[1] + "' where requestId=" + requestid; + sql = "update e10_core_business.dbo." + tableName + " set state='" + str[0] + "',message='" + str[1] + "' where id=" + requestid; logger_824c0f2.info("sql--" + sql); String poolname_et = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_et); + boolean b1 = rs.executeSql(sql, poolname_et); + logger_824c0f2.info(String.valueOf("b-->" + b1)); if (!"S".equals(str[0])) { requestinfo.getRequestManager().setMessagecontent(requestid + "光导WMS系统返回信息：" + str[1]); return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestinfo.getRequestManager())); } } catch (Exception e) { - sql = "update " + tableName + " set state='E',message='" + e.toString() + "' where requestId=" + requestid; + sql = "update e10_core_business.dbo." + tableName + " set state='E',message='" + e.toString() + "' where requestId=" + requestid; logger_824c0f2.info("sql--"+sql); String poolname_bm = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_bm); + boolean b1 = rs.executeSql(sql, poolname_bm); + logger_824c0f2.info(String.valueOf("b-->" + b1)); logger_824c0f2.error(String.valueOf(requestid + "--OaWmsReturnAction--result:" + e.toString())); requestinfo.getRequestManager().setMessagecontent("审批结果返回光导WMS系统出错：" + e.toString()); 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/OperateAccountAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateAccountAction.java index c736bc8..204b8b4 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateAccountAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateAccountAction.java @@ -82,11 +82,12 @@ public class OperateAccountAction extends BaseBean implements Action, EsbServerl } } String sta = ""; - String getStatus = "select status from " + tablename + " where requestId=" + requestId; + String getStatus = "select status from e10_core_business.dbo." + tablename + " where id=" + requestId; logger_9c33175e.info("getStatus" + getStatus); String poolname_2x = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(getStatus, poolname_2x); + boolean b = rs.executeSql(getStatus, poolname_2x); + logger_9c33175e.info("b--" + b); if (rs.next()) { sta = Util.null2String(rs.getString("status")); } @@ -118,11 +119,16 @@ public class OperateAccountAction extends BaseBean implements Action, EsbServerl logger_9c33175e.info(String.valueOf(requestId + "----" + gh + str + "成功")); } } - String sql = "update " + tablename + " set status='" + stat + "',message='" + message + "' where requestId=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set status='" + stat + "',message='" + message + "' where id=" + requestId; logger_9c33175e.info("sql" + sql); String poolname_y8 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_y8); + boolean b1 = rs.executeSql(sql, poolname_y8); + if (b1) { + logger_9c33175e.info(String.valueOf(requestId + "----" + gh + "更新状态成功")); + } else { + logger_9c33175e.info(String.valueOf(requestId + "----" + gh + "更新状态失败")); + } } } catch (Exception e) { stat = "E"; @@ -130,7 +136,8 @@ public class OperateAccountAction extends BaseBean implements Action, EsbServerl String errorLog = "update e10_core_business.dbo." + tablename + " set status='" + stat + "',message='" + message + "' where id=" + requestId; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(errorLog, poolname); + boolean b = rs.executeSql(errorLog, poolname); + logger_9c33175e.info("b--" + b); logger_9c33175e.error(requestId + "开户销户失败：" , e); return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestInfoTemp.getRequestManager())); } 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 bdca897..d90ce1f 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 @@ -182,22 +182,24 @@ public class OperateEmailAccountAction extends BaseBean implements Action, EsbSe logger_7c6670cc.info(String.valueOf(requestId + "--" + res[0] + "--" + res[1])); } } - sql = "update " + tablename + " set status='" + res[0] + "',message='" + res[1] + "' where requestId=" + requestId; + sql = "update e10_core_business.dbo." + tablename + " set status='" + res[0] + "',message='" + res[1] + "' where id=" + requestId; logger_7c6670cc.info("sql--" + sql); String poolname_46 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_46); + boolean b = rs.executeSql(sql, poolname_46); + logger_7c6670cc.info("b--" + b); if ("E".equals(res[0])) { request.getRequestManager().setMessageid("ERROR"); request.getRequestManager().setMessagecontent("处理邮箱账号失败：" + res[1]); return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestInfoTemp.getRequestManager())); } } catch (Exception e) { - sql = "update " + tablename + " set status='E',message='" + e.toString() + "' where requestId=" + requestId; + sql = "update e10_core_business.dbo." + tablename + " set status='E',message='" + e.toString() + "' where id =" + requestId; logger_7c6670cc.info("sql--" + sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b = rs.executeSql(sql, poolname); + logger_7c6670cc.info("b--" + b); logger_7c6670cc.error(String.valueOf(requestId + "处理邮箱账号失败：" + e.toString())); request.getRequestManager().setMessageid("ERROR"); request.getRequestManager().setMessagecontent("处理邮箱账号失败：" + e.toString()); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateMesAccountAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateMesAccountAction.java index 4fe446d..680a2ee 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateMesAccountAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateMesAccountAction.java @@ -84,11 +84,12 @@ public class OperateMesAccountAction extends BaseBean implements Action, EsbServ } } String sta = ""; - String getStatus = "select status from " + tablename + " where requestId=" + requestId; + String getStatus = "select status from e10_core_business.dbo." + tablename + " where id=" + requestId; logger_4057422d.info("getStatus" + getStatus); String poolname_me = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(getStatus, poolname_me); + boolean b = rs.executeSql(getStatus, poolname_me); + logger_4057422d.info("b--" + b); if (rs.next()) { sta = Util.null2String(rs.getString("status")); } @@ -120,20 +121,22 @@ public class OperateMesAccountAction extends BaseBean implements Action, EsbServ logger_4057422d.info(String.valueOf(requestId + "----" + gh + str + "成功")); } } - String sql = "update " + tablename + " set status='" + stat + "',message='" + message + "' where requestId=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set status='" + stat + "',message='" + message + "' where requestId=" + requestId; logger_4057422d.info("sql" + sql); String poolname_cc = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_cc); + boolean b1 = rs.executeSql(sql, poolname_cc); + logger_4057422d.info("b1--" + b1); } } catch (Exception e) { stat = "E"; message = e.toString(); - String errorLog = "update " + tablename + " set status='" + stat + "',message='" + message + "' where requestId=" + requestId; + String errorLog = "update e10_core_business.dbo." + tablename + " set status='" + stat + "',message='" + message + "' where requestId=" + requestId; logger_4057422d.info("errorLog" + errorLog); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(errorLog, poolname); + boolean b = rs.executeSql(errorLog, poolname); + logger_4057422d.info("b--" + b); logger_4057422d.error(String.valueOf(requestId + "开户销户失败：" + e.toString())); return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestInfoTemp.getRequestManager())); } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/PMProjectAcceptanceAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/PMProjectAcceptanceAction.java index 1af8cec..060a7a4 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/PMProjectAcceptanceAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/PMProjectAcceptanceAction.java @@ -115,10 +115,11 @@ public class PMProjectAcceptanceAction extends BaseBean implements Action, EsbSe String[] docs = fj.split(","); for (int i = 0; i < docs.length; i++) { String docid = docs[i]; - String sql = " select b.filerealpath,b.iszip,b.name,b.imagefileid from " + " fileobj b where b.imagefileid in(select max(imagefileid) " + "from document_main_access as docimagefile where docid in(" + docid + ") group by docid)"; + String sql = " select b.filerealpath,b.iszip,b.name,b.imagefileid from " + " e10_common.dbo.fileobj b where b.imagefileid in(select max(imagefileid) " + "from e10_common.dbo.document_main_access as docimagefile where docid in(" + docid + ") group by docid)"; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b = rs.executeSql(sql, poolname); + logger_f17f81aa.info("b--" + b); if (rs.next()) { JSONObject fileItem = new JSONObject(); String imagefileid = Util.null2String(rs.getString("imagefileid")); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/QingJiaShenQingAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/QingJiaShenQingAction.java index bccfbdd..de5a155 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/QingJiaShenQingAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/QingJiaShenQingAction.java @@ -138,7 +138,8 @@ public class QingJiaShenQingAction extends BaseBean implements Action, EsbServer } else if (name.equals("QJLB2")) { String poolname = ""; // TODO E10必须指定poolname数据源 - rdsd.executeSql("select classcode from ht_ATDATTENDANCECLASS where ID='" + value + "'", "hr"); + boolean b = rdsd.executeSql("select classcode from e10_common.dbo.ht_ATDATTENDANCECLASS where ID='" + value + "'", "hr"); + logger_13aa9db7.info("b == " + b); rdsd.next(); QJLB = Util.null2String(rdsd.getString("classcode")); } else if (name.equals("SQRQ")) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/QingJiaShenQingCheckAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/QingJiaShenQingCheckAction.java index 08db65a..f83ee6e 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/QingJiaShenQingCheckAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/QingJiaShenQingCheckAction.java @@ -121,7 +121,8 @@ public class QingJiaShenQingCheckAction extends BaseBean implements Action, EsbS } else if (name.equals("QJLB2")) { String poolname = ""; // TODO E10必须指定poolname数据源 - rdsd.executeSql("select classcode from ht_ATDATTENDANCECLASS where ID='" + value + "'", "hr"); + boolean b = rdsd.executeSql("select classcode from e10_common.dbo.ht_ATDATTENDANCECLASS where ID='" + value + "'", "hr"); + logger_7cebd27d.info("b == " + b); rdsd.next(); QJLB = Util.null2String(rdsd.getString("classcode")); } else if (name.equals("SQRQ")) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SCFAndEASApplyUserSyncAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SCFAndEASApplyUserSyncAction.java index 3a59c3c..440c267 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SCFAndEASApplyUserSyncAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SCFAndEASApplyUserSyncAction.java @@ -164,21 +164,24 @@ public class SCFAndEASApplyUserSyncAction extends BaseBean implements Action, Es currentdate = time.substring(0, 10); currenttime = time.substring(11); } - String sql = "select id from uf_applyUser where companycode='" + companyCode + "' and lclx=" + list.get(i).get("lclx"); + String sql = "select id from e10_common.dbo.uf_applyUser where companycode='" + companyCode + "' and lclx=" + list.get(i).get("lclx"); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b = rs.executeSql(sql, poolname); + logger_c018d513.info("b1 -----"+ b); if (rs.next()) { if ("0".equals(lclx)) { String poolname_7m = CONN_TYPE.workflow.getType(); /*开票申请 TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - rs.executeSql("update uf_applyUser set " + "'E10无此字段formmodeid'='139'" + ", modedatacreater=" + sqr + ", 'E10无此字段modedatacreatertype'= '0'" + ", modedatacreatedate= '" + currentdate + "'" + ", modedatacreatetime= '" + currenttime + "'" + ", oafqr=" + list.get(i).get("oafqr") + ",oafqrgh='" + list.get(i).get("oafqrgh") + "'" + " where companycode='" + companyCode + "' and lclx=" + list.get(i).get("lclx"), poolname_7m); + boolean b1 = rs.executeSql("update e10_common.dbo.uf_applyUser set " + "'E10无此字段formmodeid'='139'" + ", modedatacreater=" + sqr + ", 'E10无此字段modedatacreatertype'= '0'" + ", modedatacreatedate= '" + currentdate + "'" + ", modedatacreatetime= '" + currenttime + "'" + ", oafqr=" + list.get(i).get("oafqr") + ",oafqrgh='" + list.get(i).get("oafqrgh") + "'" + " where companycode='" + companyCode + "' and lclx=" + list.get(i).get("lclx"), poolname_7m); + logger_c018d513.info("b1 -----"+ b1); } else { String poolname_19 = CONN_TYPE.workflow.getType(); /*直贷业务 TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - rs.executeSql("update uf_applyUser set " + "'E10无此字段formmodeid'='139'" + ", modedatacreater=" + sqr + ", 'E10无此字段modedatacreatertype'= '0'" + ", modedatacreatedate= '" + currentdate + "'" + ", modedatacreatetime= '" + currenttime + "'" + ", oafqr=" + list.get(i).get("oafqr") + ",oafqrgh='" + list.get(i).get("oafqrgh") + "'" + ", easfqr=" + list.get(i).get("oafqr") + ",easfqrgh='" + list.get(i).get("oafqrgh") + "'" + " where companycode='" + companyCode + "' and lclx=" + list.get(i).get("lclx"), poolname_19); + boolean b1 = rs.executeSql("update e10_common.dbo.uf_applyUser set " + "'E10无此字段formmodeid'='139'" + ", modedatacreater=" + sqr + ", 'E10无此字段modedatacreatertype'= '0'" + ", modedatacreatedate= '" + currentdate + "'" + ", modedatacreatetime= '" + currenttime + "'" + ", oafqr=" + list.get(i).get("oafqr") + ",oafqrgh='" + list.get(i).get("oafqrgh") + "'" + ", easfqr=" + list.get(i).get("oafqr") + ",easfqrgh='" + list.get(i).get("oafqrgh") + "'" + " where companycode='" + companyCode + "' and lclx=" + list.get(i).get("lclx"), poolname_19); + logger_c018d513.info("b1 -----"+ b1); } // rs.execute("update uf_applyUser set oafqr="+list.get(i).get("oafqr")+",oafqrgh='"+list.get(i).get("oafqrgh")+"',easfqr="+list.get(i).get("easfqr")+",easfqrgh='"+list.get(i).get("easfqrgh")+"' where companycode='"+companyCode+"' and lclx="+list.get(i).get("lclx")); } else { @@ -189,15 +192,17 @@ public class SCFAndEASApplyUserSyncAction extends BaseBean implements Action, Es /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ long generate = IdGenerator.generate(); - rs.executeSql("insert into uf_applyUser(companycode,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime," + "lclx,oafqr,oafqrgh,modeuuid) " + "values('" + companyCode + "'," + "'139'," + sqr + "," + "'0'," + "'" + currentdate + "'," + "'" + currenttime + "'," + list.get(i).get("lclx") + "," + list.get(i).get("oafqr") + ",'" + list.get(i).get("oafqrgh") + "','" + uuid + "')", poolname_qw,generate); + boolean b1 = rs.executeSql("insert into e10_common.dbo.uf_applyUseruf_applyUser(companycode,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime," + "lclx,oafqr,oafqrgh,modeuuid) " + "values('" + companyCode + "'," + "'139'," + sqr + "," + "'0'," + "'" + currentdate + "'," + "'" + currenttime + "'," + list.get(i).get("lclx") + "," + list.get(i).get("oafqr") + ",'" + list.get(i).get("oafqrgh") + "','" + uuid + "')", poolname_qw, generate); + logger_c018d513.info("b1 -----"+ b1); } else { String poolname_2n = CONN_TYPE.workflow.getType(); /*直贷业务 TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ long generate = IdGenerator.generate(); - rs.executeSql("insert into uf_applyUser(companycode,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime," + "lclx,oafqr,oafqrgh,easfqr,easfqrgh,modeuuid) " + "values('" + companyCode + "'," + "'139'," + sqr + "," + "'0'," + "'" + currentdate + "'," + "'" + currenttime + "'," + list.get(i).get("lclx") + "," + list.get(i).get("oafqr") + ",'" + list.get(i).get("oafqrgh") + "'," + list.get(i).get("oafqr") + ",'" + list.get(i).get("oafqrgh") + "','" + uuid + // DiscountedInvoiceApplicationImpl 使用eas发起人 - "')", poolname_2n,generate); + boolean b1 = rs.executeSql("insert into e10_common.dbo.uf_applyUseruf_applyUser(companycode,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime," + "lclx,oafqr,oafqrgh,easfqr,easfqrgh,modeuuid) " + "values('" + companyCode + "'," + "'139'," + sqr + "," + "'0'," + "'" + currentdate + "'," + "'" + currenttime + "'," + list.get(i).get("lclx") + "," + list.get(i).get("oafqr") + ",'" + list.get(i).get("oafqrgh") + "'," + list.get(i).get("oafqr") + ",'" + list.get(i).get("oafqrgh") + "','" + uuid + // DiscountedInvoiceApplicationImpl 使用eas发起人 + "')", poolname_2n, generate); + logger_c018d513.info("b1 -----"+ b1); } // rs.execute("F"); } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SY_WLPS_NEW_RETURNAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SY_WLPS_NEW_RETURNAction.java index 632b0ac..f555d43 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SY_WLPS_NEW_RETURNAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SY_WLPS_NEW_RETURNAction.java @@ -98,21 +98,23 @@ public class SY_WLPS_NEW_RETURNAction extends BaseBean implements Action, EsbSer String[] ret = service.returnRes(req); if ("E".equals(ret[0])) { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "update " + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where requestId=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where requestId=" + requestId; String poolname_9c = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_9c); + boolean b = rs.executeSql(sql, poolname_9c); + logger_882eb0b2.info("b -----"+ b); return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", "", requestinfo.getRequestManager())); } logger_882eb0b2.info(String.valueOf("SY_WLPS_NEW_RETURNAction--" + requestId + "执行结束")); } catch (Exception exception) { logger_882eb0b2.error(String.valueOf("SY_WLPS_NEW_RETURNAction--" + requestId + "执行出错：" + exception.getMessage())); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "update " + tablename + " set state='E',message='" + exception.getMessage() + "' where requestId=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set state='E',message='" + exception.getMessage() + "' where requestId=" + requestId; logger_882eb0b2.info("sql--" + sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b = rs.executeSql(sql, poolname); + logger_882eb0b2.info("b -----"+ b); return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", exception.getMessage(), requestinfo.getRequestManager())); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager())); @@ -133,7 +135,8 @@ public class SY_WLPS_NEW_RETURNAction extends BaseBean implements Action, EsbSer RecordSet recordSet = I18nContextUtil.getBean(RecordSet.class); String poolname_p2 = 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_p2); + boolean b = recordSet.executeSql("select c.name from e10_common.dbo.wfp_base a " + "INNER JOIN e10_common.dbo.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_p2); + logger_882eb0b2.info("b--" + b); if (recordSet.next()) { name = recordSet.getString("selectname"); } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SY_WLPS_RETURNAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SY_WLPS_RETURNAction.java index 7cc6762..b4cb130 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SY_WLPS_RETURNAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SY_WLPS_RETURNAction.java @@ -94,21 +94,23 @@ public class SY_WLPS_RETURNAction extends BaseBean implements Action, EsbServerl logger_1852f2d3.info(String.valueOf("SY_WLPS_RETURNAction--" + requestId + "--return--" + ret[0] + "|" + ret[1])); if ("E".equals(ret[0])) { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "update " + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where requestId=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where id=" + requestId; logger_1852f2d3.info("sql--" + sql); String poolname_ki = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_ki); + boolean b = rs.executeSql(sql, poolname_ki); + logger_1852f2d3.info("b -----"+ b); } logger_1852f2d3.info(String.valueOf("SY_WLPS_RETURNAction--" + requestId + "执行结束")); } catch (Exception exception) { logger_1852f2d3.info(String.valueOf("SY_WLPS_RETURNAction--" + requestId + "执行出错：" + exception.getMessage())); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "update " + tablename + " set state='E',message='" + exception.getMessage() + "' where requestId=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set state='E',message='" + exception.getMessage() + "' where id=" + requestId; logger_1852f2d3.info("sql--" + sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b = rs.executeSql(sql, poolname); + logger_1852f2d3.info("b -----"+ b); return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", exception.getMessage(), requestinfo.getRequestManager())); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager())); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SY_WLPS_RETURNNewAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SY_WLPS_RETURNNewAction.java index 115f537..7d651ee 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SY_WLPS_RETURNNewAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SY_WLPS_RETURNNewAction.java @@ -92,22 +92,24 @@ public class SY_WLPS_RETURNNewAction extends BaseBean implements Action, EsbServ String[] ret = service.returnRes(req); if ("E".equals(ret[0])) { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "update " + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where requestId=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where requestId=" + requestId; logger_4dd7c639.info("sql--" + sql); String poolname_2y = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_2y); + boolean b = rs.executeSql(sql, poolname_2y); + logger_4dd7c639.info("b -----"+ b); return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", FAILURE_AND_CONTINUE, requestinfo.getRequestManager())); } logger_4dd7c639.info(String.valueOf("SY_WLPS_RETURNAction--" + requestId + "执行结束")); } catch (Exception exception) { logger_4dd7c639.info(String.valueOf("SY_WLPS_RETURNAction--" + requestId + "执行出错：" + exception.getMessage())); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "update " + tablename + " set state='E',message='" + exception.getMessage() + "' where requestId=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set state='E',message='" + exception.getMessage() + "' where requestId=" + requestId; logger_4dd7c639.info("sql--" + sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b = rs.executeSql(sql, poolname); + logger_4dd7c639.info("b -----"+ b); return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", FAILURE_AND_CONTINUE, requestinfo.getRequestManager())); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager())); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/TransferBillToK3Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/TransferBillToK3Action.java index c6e3793..b2ea399 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/TransferBillToK3Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/TransferBillToK3Action.java @@ -149,27 +149,30 @@ public class TransferBillToK3Action extends BaseBean implements Action, EsbServe return WeaResult.fail(500, "出错啦", getResultMapForAction(weaverResultMap, "result", "", requestinfo.getRequestManager())); } if (str[3].length() > 0) { - sql = "update " + tablename + "_dt1 set tbzt=1 where ckbm in (" + str[3].substring(0, str[3].length() - 1) + ") and mainid =(select id from " + tablename + " where requestid=" + requestid + ")"; + sql = "update e10_core_business.dbo." + tablename + "_dt1 set tbzt=1 where ckbm in (" + str[3].substring(0, str[3].length() - 1) + ") and form_data_id =(select form_data_id from e10_core_business.dbo." + tablename + " where id=" + requestid + ")"; logger_1a36f94a.info("sql--"+sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b = rs.executeSql(sql, poolname); + logger_1a36f94a.info(String.valueOf(requestid + "调拨单成功的：" + b)); logger_1a36f94a.info(String.valueOf(requestid + "调拨单成功的：" + sql)); } if (str[2].length() > 0) { - sql = "update " + tablename + "_dt1 set tbzt=0 where ckbm in (" + str[2].substring(0, str[2].length() - 1) + ") and mainid =(select id from " + tablename + " where requestid=" + requestid + ")"; + sql = "update e10_core_business.dbo." + tablename + "_dt1 set tbzt=0 where ckbm in (" + str[2].substring(0, str[2].length() - 1) + ") and form_data_id =(select form_data_id from e10_core_business.dbo." + tablename + " where id=" + requestid + ")"; logger_1a36f94a.info("sql--"+sql); String poolname_ji = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_ji); + boolean b = rs.executeSql(sql, poolname_ji); + logger_1a36f94a.info(String.valueOf(requestid + "调拨单失败的：" + b)); logger_1a36f94a.info(String.valueOf(requestid + "调拨单失败的：" + sql)); } if (str[2].length() == 0 && str[3].length() == 0) { - sql = "update " + tablename + "_dt1 set tbzt=0 where (tbzt is null or tbzt !=1) and mainid =(select id from " + tablename + " where requestid=" + requestid + ")"; + sql = "update e10_core_business.dbo." + tablename + "_dt1 set tbzt=0 where (tbzt is null or tbzt !=1) and form_data_id =(select form_data_id from e10_core_business.dbo." + tablename + " where id=" + requestid + ")"; logger_1a36f94a.info("sql--"+sql); String poolname_19 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_19); + boolean b = rs.executeSql(sql, poolname_19); + logger_1a36f94a.info(String.valueOf(requestid + "调拨单全失败：" + b)); logger_1a36f94a.info(String.valueOf(requestid + "调拨单全失败：" + sql)); } } @@ -182,7 +185,8 @@ public class TransferBillToK3Action extends BaseBean implements Action, EsbServe } String poolname_sn = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update " + tablename + " set message=isnull(message,'')+'" + message + "' where requestid=" + requestid, poolname_sn); + boolean b = rs.executeSql("update e10_core_business.dbo." + tablename + " set message=isnull(message,'')+'" + message + "' where id =" + requestid, poolname_sn); + logger_1a36f94a.info(String.valueOf(requestid + "调拨单消息：" + b)); return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager())); } catch (Exception e) { e.printStackTrace(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateFwInfoAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateFwInfoAction.java index ba9f48f..351f38c 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateFwInfoAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateFwInfoAction.java @@ -78,11 +78,12 @@ public class UpdateFwInfoAction extends BaseBean implements Action, EsbServerles return WeaResult.fail(500, "出错啦", getResultMapForAction(weaverResultMap, "result", e.getMessage(), request.getRequestManager())); } finally { // 重构成功后 更新状态 - String sql2 = (new StringBuilder()).append("update ").append(tablename).append(" set sta ='").append(state).append("', meg = '").append(message).append("' where requestId = ").append(requestid).toString(); + String sql2 = (new StringBuilder()).append("update e10_core_business.dbo.").append(tablename).append(" set sta ='").append(state).append("', meg = '").append(message).append("' where id = ").append(requestid).toString(); logger_af68f31d.info(String.valueOf((new StringBuilder()).append("UpdateFwInfoAction 更新状态 logsql:").append(sql2).toString())); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql2, poolname); + boolean b = rs.executeSql(sql2, poolname); + logger_af68f31d.info("b -----"+ b); } logger_af68f31d.info(String.valueOf("do UpdateFwInfoAction success!")); return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateTaskNumber.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateTaskNumber.java index c85da41..e347d12 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateTaskNumber.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateTaskNumber.java @@ -55,7 +55,8 @@ public class UpdateTaskNumber implements Action, EsbServerlessRpcRemoteInterface logger_2c12a616.info(String.valueOf("sql=" + sql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b = rs.executeSql(sql, poolname); + logger_2c12a616.info("b--"+b); int k = 0; while (rs.next()) { String id = rs.getString("id"); @@ -69,7 +70,8 @@ public class UpdateTaskNumber implements Action, EsbServerlessRpcRemoteInterface logger_2c12a616.info(String.valueOf("sql1=" + sql)); String poolname_dw = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql1, poolname_dw); + boolean b1 = rs.executeSql(sql1, poolname_dw); + logger_2c12a616.info( "b1--" + b1) ; k++; } } catch (Exception e) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/XNY_YCLTC_ReturnAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/XNY_YCLTC_ReturnAction.java index 93147dd..2f78e21 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/XNY_YCLTC_ReturnAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/XNY_YCLTC_ReturnAction.java @@ -89,21 +89,23 @@ public class XNY_YCLTC_ReturnAction extends BaseBean implements Action, EsbServe String[] ret = service.returnRes(req); if ("E".equals(ret[0])) { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where requestId=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where id=" + requestId; logger_555b962f.info("sql--" + sql); String poolname_ah = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_ah); + boolean b = rs.executeSql(sql, poolname_ah); + logger_555b962f.info("b--" + b); return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", FAILURE_AND_CONTINUE, requestinfo.getRequestManager())); } logger_555b962f.info(String.valueOf("XNY_YCLTC_ReturnAction--" + requestId + "执行结束")); } catch (Exception exception) { logger_555b962f.info(String.valueOf("XNY_YCLTC_ReturnAction--" + requestId + "执行出错：" + exception.getMessage())); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "update e10_core_business.dbo." + tablename + " set state='E',message='" + exception.getMessage() + "' where requestId=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set state='E',message='" + exception.getMessage() + "' where id=" + requestId; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b = rs.executeSql(sql, poolname); + logger_555b962f.info(String.valueOf("b--" + b)); return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", FAILURE_AND_CONTINUE, requestinfo.getRequestManager())); } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/YongGongXuQiuAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/YongGongXuQiuAction.java index 2f872ea..f39b5f0 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/YongGongXuQiuAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/YongGongXuQiuAction.java @@ -70,19 +70,21 @@ public class YongGongXuQiuAction implements Action, EsbServerlessRpcRemoteInterf RecordSet rs2 = I18nContextUtil.getBean(RecordSet.class); String workflowid = request.getWorkflowid(); String maintable = ""; - String sql = "select b.tablename from wfp_base a,form b where a.formid = b.id and a.id = " + workflowid; + String sql = "select b.tablename from e10_common.dbo.wfp_base a,e10_common.dbo.form b where a.formid = b.id and a.id = " + workflowid; logger_42aadd27.info("getMainTableInfo sql = " + sql); - String createsqlString = "select id from employee as hrmresource where lastname ='" + creater + "'"; + String createsqlString = "select id from eteams.dbo.employee as hrmresource where lastname ='" + creater + "'"; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs2.executeSql(createsqlString, poolname); + boolean b = rs2.executeSql(createsqlString, poolname); + logger_42aadd27.info("getMainTableInfo rs2.executeSql = " + b); rs2.next(); String createrId = rs2.getString("id"); String poolname_hy = CONN_TYPE.workflow.getType(); // int departmentId = Util.getIntValue(rs2.getString("id")); /* String creater = rs2.getString("departmentmark") + "_" + rs2.getString("lastname"); TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - rs.executeSql(sql, poolname_hy); + boolean b1 = rs.executeSql(sql, poolname_hy); + logger_42aadd27.info("getMainTableInfo rs.executeSql = " + b1); while (rs.next()) { maintable = rs.getString("tablename"); } @@ -125,7 +127,7 @@ public class YongGongXuQiuAction implements Action, EsbServerlessRpcRemoteInterf XQBM = value; String poolname_rh = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - String sql1 = "select code from department as HrmDepartment where id =" + XQBM; + String sql1 = "select code from eteams.dbo.department as HrmDepartment where id =" + XQBM; logger_42aadd27.info("getMainTableInfo sql = " + sql1); rs.executeSql(sql1, poolname_rh); rs.next(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_CCSQ_AQJB_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_CCSQ_AQJB_Action.java index 562916e..f694795 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_CCSQ_AQJB_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_CCSQ_AQJB_Action.java @@ -95,7 +95,8 @@ public class ZOA_CCSQ_AQJB_Action extends BaseBean implements Action, EsbServerl logger_31bb84de.info(String.valueOf("logsql:" + logsql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs1.executeSql(logsql, poolname); + boolean b = rs1.executeSql(logsql, poolname); + logger_31bb84de.info(String.valueOf("b--"+b)); } logger_31bb84de.info(String.valueOf("ZOA_CCSQ_AQJB_Action-Request: " + reid + "完成")); } catch (Exception e) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FICO_ANLA_CHANGEAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FICO_ANLA_CHANGEAction.java index 3a89f1c..3fb5ece 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FICO_ANLA_CHANGEAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FICO_ANLA_CHANGEAction.java @@ -72,7 +72,8 @@ public class ZOA_FICO_ANLA_CHANGEAction extends BaseBean implements Action, EsbS String sql = "update e10_core_business.dbo." + tablename + " set sta ='" + e_istat + "', meg = '" + e_message + "' where id = " + requestId; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b = rs.executeSql(sql, poolname); + logger_14793b45.info("b--"+b); } else { requestinfo.getRequestManager().setMessageid(e_istat); requestinfo.getRequestManager().setMessagecontent(e_message); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FICO_COC_CREATIONAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FICO_COC_CREATIONAction.java index 0e2cd32..c131370 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FICO_COC_CREATIONAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FICO_COC_CREATIONAction.java @@ -75,11 +75,12 @@ public class ZOA_FICO_COC_CREATIONAction extends BaseBean implements Action, Esb String e_istat = String.valueOf(returnStr[0]); String e_message = String.valueOf(returnStr[1]); if ("S".equals(e_istat)) { - String sql = "update " + tablename + " set sta ='" + e_istat + "', meg = '" + e_message + "' where requestId = " + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set sta ='" + e_istat + "', meg = '" + e_message + "' where id = " + requestId; logger_8236b79b.info("sql--" + sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b = rs.executeSql(sql, poolname); + logger_8236b79b.info("b -----" + b); } else { requestinfo.getRequestManager().setMessageid("ERROR"); requestinfo.getRequestManager().setMessagecontent(e_message); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_CUSTOMER_MAINTAINAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_CUSTOMER_MAINTAINAction.java index a38f85d..2762a4a 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_CUSTOMER_MAINTAINAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_CUSTOMER_MAINTAINAction.java @@ -218,15 +218,16 @@ public class ZOA_FI_CUSTOMER_MAINTAINAction extends BaseBean implements Action, String output = "----" + date + "," + time + "," + meg; String logsql = ""; if (kunnr.equals("")) { - logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + output + "' where requestId = " + reid; + logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + output + "' where id = " + reid; logger_30bd33f8.info(String.valueOf("start log--" + edit_flag + "--" + reid)); } else { - logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', khdm = '" + kunnr + "', meg = '" + output + "' where requestId = " + reid; + logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', khdm = '" + kunnr + "', meg = '" + output + "' where id = " + reid; logger_30bd33f8.info(String.valueOf("start log--" + edit_flag + "--" + reid)); } String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs1.executeSql(logsql, poolname); + boolean b = rs1.executeSql(logsql, poolname); + logger_30bd33f8.info(String.valueOf("b--" + b)); logger_30bd33f8.info(String.valueOf("start log--" + edit_flag + "--" + reid)); logger_30bd33f8.info(String.valueOf("------------------------------------------------------------------------")); logger_30bd33f8.info(String.valueOf("ZOA_FI_CUSTOMER_MAINTAINAction:" + logsql)); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_IORD_RFC_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_IORD_RFC_Action.java index 4882d5d..bfb14e9 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_IORD_RFC_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_IORD_RFC_Action.java @@ -83,9 +83,10 @@ public class ZOA_FI_IORD_RFC_Action extends BaseBean implements Action, EsbServe RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0][0] + "',message='" + ret[0][1] + "',nbddh=isnull('" + ret[0][2] + "','') where requestId=" + requestid; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0][0] + "',message='" + ret[0][1] + "',nbddh=isnull('" + ret[0][2] + "','') where id=" + requestid; logger_a0e600a3.info(String.valueOf("ZOA_FI_IORD_RFC_Action--sql--" + sql + "-" + requestid)); - rs.executeSql(sql, poolname); + boolean b = rs.executeSql(sql, poolname); + logger_a0e600a3.info(String.valueOf("ZOA_FI_IORD_RFC_Action--b--" + b + "-" + requestid)); if (!"S".equals(ret[0][0])) { requestinfo.getRequestManager().setMessageid("ERROR"); requestinfo.getRequestManager().setMessagecontent("SAP返回错误信息：" + ret[0][1]); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_VENDOR_MAINTAIN_GYSAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_VENDOR_MAINTAIN_GYSAction.java index 2c7c5b1..7e1b4b7 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_VENDOR_MAINTAIN_GYSAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_VENDOR_MAINTAIN_GYSAction.java @@ -231,14 +231,15 @@ public class ZOA_FI_VENDOR_MAINTAIN_GYSAction extends BaseBean implements Action String output = "----" + date + "," + time + "," + meg; String logsql = ""; if (lifnr.equals("")) { - logsql = "update " + tablename + " set sta ='" + sta + "', meg = '" + output + "' where requestId = " + reid; + logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + output + "' where id = " + reid; } else { - logsql = "update " + tablename + " set sta ='" + sta + "', gysdm = '" + lifnr + "', meg = '" + output + "' where requestId = " + reid; + logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', gysdm = '" + lifnr + "', meg = '" + output + "' where id = " + reid; } logger_2da6de30.info(String.valueOf("start logsql--" + logsql + "--" + reid)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs1.executeSql(logsql, poolname); + boolean b = rs1.executeSql(logsql, poolname); + logger_2da6de30.info(String.valueOf("b--" + b)); logger_2da6de30.info(String.valueOf("start log--" + edit_flag + "--" + reid)); logger_2da6de30.info(String.valueOf("------------------------------------------------------------------------")); logger_2da6de30.info(String.valueOf("ZOA_FI_VENDOR_MAINTAIN_GYSAction:" + logsql)); 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 fe95e8a..11facae 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 @@ -171,7 +171,8 @@ public class ZOA_MM_PR_CREATE_BpAction extends BaseBean implements Action, EsbSe logger_8cb80c57.info(String.valueOf(nowTime + " " + reid + "logsql:" + logsql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs1.executeSql(logsql, poolname); + boolean b = rs1.executeSql(logsql, poolname); + logger_8cb80c57.info(String.valueOf(nowTime + " " + reid + "b--" + b)); logger_8cb80c57.info(String.valueOf(nowTime + " " + reid + "start log--" + code + "--" + sqrxm)); logger_8cb80c57.info(String.valueOf("------------------------------------------------------------------------")); logger_8cb80c57.info(String.valueOf(nowTime + " " + reid + "ZOA_MM_PR_CREATE_BpAction:" + logsql)); 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 fe313aa..28396f4 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 @@ -178,10 +178,11 @@ public class ZOA_MM_PR_CREATE_FYH_BgAction extends BaseBean implements Action, E String date = datetype.format(now); String time = timetype.format(now); String output = date + "," + time + "," + meg; - String logsql = "update " + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where requestId = " + reid; + String logsql = "update e10_core_business.dbo." + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where id = " + reid; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs1.executeSql(logsql, poolname); + boolean b = rs1.executeSql(logsql, poolname); + logger_371c14b8.info("b--"+b); logger_371c14b8.info(String.valueOf("start log--" + code + "--" + sqrxm)); logger_371c14b8.info(String.valueOf("------------------------------------------------------------------------")); logger_371c14b8.info(String.valueOf("ZOA_MM_PR_CREATE_FYH_BgAction:" + logsql)); 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 d38b98e..a721d79 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 @@ -168,7 +168,8 @@ public class ZOA_MM_PR_CREATE_FYH_FyAction extends BaseBean implements Action, E logger_8ed0f2c6.info(String.valueOf("ZOA_MM_PR_CREATE_FYH_FyAction:" + logsql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs1.executeSql(logsql, poolname); + boolean b = rs1.executeSql(logsql, poolname); + logger_8ed0f2c6.info("b--" + b); logger_8ed0f2c6.info(String.valueOf("start log--" + code + "--" + sqrxm)); logger_8ed0f2c6.info(String.valueOf("------------------------------------------------------------------------")); logger_8ed0f2c6.info(String.valueOf("ZOA_MM_PR_CREATE_FYH_FyAction:" + logsql)); 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 91ddd70..f1c1892 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 @@ -176,11 +176,12 @@ public class ZOA_MM_PR_CREATE_GDZC_ZcAction extends BaseBean implements Action, String date = datetype.format(now); String time = timetype.format(now); String output = date + "," + time + "," + meg; - String logsql = "update e10_core_business.dbo." + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where requestId = " + reid; + String logsql = "update e10_core_business.dbo." + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where id = " + reid; logger_a58ea05.info("logsql--" + logsql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs1.executeSql(logsql, poolname); + boolean b = rs1.executeSql(logsql, poolname); + logger_a58ea05.info(String.valueOf("ZOA_MM_PR_CREATE_GDZC_ZcAction:" + b)); logger_a58ea05.info(String.valueOf("start log--" + code + "--" + sqrxm)); logger_a58ea05.info(String.valueOf("------------------------------------------------------------------------")); logger_a58ea05.info(String.valueOf("ZOA_MM_PR_CREATE_GDZC_ZcAction:" + logsql)); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_JGJ_JgAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_JGJ_JgAction.java index 60f8cbc..8e9b7bc 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_JGJ_JgAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_JGJ_JgAction.java @@ -293,7 +293,8 @@ public class ZOA_MM_PR_CREATE_JGJ_JgAction extends BaseBean implements Action, E String logsql = "update e10_core_business.dbo." + tablename + " set cgsqh ='" + cgsqh + "', state = '" + sta + "', message = '" + output + "' where id = " + reid; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs1.executeSql(logsql, poolname); + boolean b = rs1.executeSql(logsql, poolname); + logger_56a61d8.info("b--" + b); logger_56a61d8.info(String.valueOf("start log--" + code + "--" + sqrxm)); logger_56a61d8.info(String.valueOf("------------------------------------------------------------------------")); logger_56a61d8.info(String.valueOf("ZOA_MM_PR_CREATE_JGJ_JgAction:" + logsql)); 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 f363b9b..db2ec29 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 @@ -162,11 +162,12 @@ public class ZOA_MM_PR_CREATE_LbAction extends BaseBean implements Action, EsbSe String date = datetype.format(now); String time = timetype.format(now); String output = date + "," + time + "," + meg; - String logsql = "update e10_core_business.dbo." + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where requestId = " + reid; + String logsql = "update e10_core_business.dbo." + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where id = " + reid; logger_b6ec8f7f.info(String.valueOf("start logsql--" + logsql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs1.executeSql(logsql, poolname); + boolean b = rs1.executeSql(logsql, poolname); + logger_b6ec8f7f.info("b--" + b); logger_b6ec8f7f.info(String.valueOf("start log--" + code + "--" + sqrxm)); logger_b6ec8f7f.info(String.valueOf("------------------------------------------------------------------------")); logger_b6ec8f7f.info(String.valueOf("ZOA_MM_PR_CREATE_LbAction:" + logsql)); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_SCXAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_SCXAction.java index 6d5a8a7..2601aa0 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_SCXAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_SCXAction.java @@ -167,7 +167,8 @@ public class ZOA_MM_PR_CREATE_SCXAction extends BaseBean implements Action, EsbS logger_25ffe2ab.info("logsql--" + logsql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs1.executeSql(logsql, poolname); + boolean b = rs1.executeSql(logsql, poolname); + logger_25ffe2ab.info("b--" + b); logger_25ffe2ab.info(String.valueOf("start log--" + code + "--" + sqrxm)); logger_25ffe2ab.info(String.valueOf("------------------------------------------------------------------------")); logger_25ffe2ab.info(String.valueOf("ZOA_MM_PR_CREATE_SCXAction:" + logsql)); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_WWJGAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_WWJGAction.java index 27af4f0..d81067e 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_WWJGAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_WWJGAction.java @@ -159,7 +159,8 @@ public class ZOA_MM_PR_CREATE_WWJGAction extends BaseBean implements Action, Esb logger_54a06806.info("logsql--" + logsql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs1.executeSql(logsql, poolname); + boolean b = rs1.executeSql(logsql, poolname); + logger_54a06806.info("b--" + b); logger_54a06806.info(String.valueOf("start log--" + code + "--" + sqrxm)); logger_54a06806.info(String.valueOf("------------------------------------------------------------------------")); logger_54a06806.info(String.valueOf("ZOA_MM_PR_CREATE_WWJGAction:" + logsql)); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_YFAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_YFAction.java index 0ce213c..d0f77fd 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_YFAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_YFAction.java @@ -161,7 +161,8 @@ public class ZOA_MM_PR_CREATE_YFAction extends BaseBean implements Action, EsbSe logger_342d5bb6.info("logsql" + logsql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs1.executeSql(logsql, poolname); + boolean b = rs1.executeSql(logsql, poolname); + logger_342d5bb6.info("b--" + b); logger_342d5bb6.info(String.valueOf("start log--" + code + "--" + sqrxm)); logger_342d5bb6.info(String.valueOf("------------------------------------------------------------------------")); logger_342d5bb6.info(String.valueOf("ZOA_MM_PR_CREATE_YFAction:" + logsql)); 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 d269601..145b937 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 @@ -200,7 +200,8 @@ public class ZOA_MM_PR_CREATE_YFFY_ZjAction extends BaseBean implements Action, String logsql = "update e10_core_business.dbo." + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where id = " + reid; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs1.executeSql(logsql, poolname); + boolean b = rs1.executeSql(logsql, poolname); + logger_adb00a32.info("b--" + b); if (!"S".equals(sta)) { logUtil.setJkzt("1"); logUtil.insertLog(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_ZJGC_ZjAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_ZJGC_ZjAction.java index 4433d9b..8c357d4 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_ZJGC_ZjAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_ZJGC_ZjAction.java @@ -181,7 +181,8 @@ public class ZOA_MM_PR_CREATE_ZJGC_ZjAction extends BaseBean implements Action, String logsql = "update e10_core_business.dbo." + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where id = " + reid; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs1.executeSql(logsql, poolname); + boolean b = rs1.executeSql(logsql, poolname); + logger_518ea046.info("b--" + b); logger_518ea046.info(String.valueOf("start log--" + code + "--" + sqrxm)); logger_518ea046.info(String.valueOf("------------------------------------------------------------------------")); logger_518ea046.info(String.valueOf("ZOA_MM_PR_CREATE_ZJGC_ZjAction:" + logsql)); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_RELEASEAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_RELEASEAction.java index 3e68872..5ce65a2 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_RELEASEAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_RELEASEAction.java @@ -70,7 +70,8 @@ public class ZOA_MM_PR_RELEASEAction extends BaseBean implements Action, EsbServ // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 String sql1 = "select top 1 id from e10_core_business.dbo." + tablename + " where id = " + requestId; logger_41a94d2d.info("sql1 -----" + sql1); - recordset.executeSql(sql1, poolname); + boolean b = recordset.executeSql(sql1, poolname); + logger_41a94d2d.info("b -----" + b); if (recordset.next()) { id = recordset.getString("id"); } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SD_CREDIT_HANDLE_APPROVALAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SD_CREDIT_HANDLE_APPROVALAction.java index 2a419d4..a28cc1d 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SD_CREDIT_HANDLE_APPROVALAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SD_CREDIT_HANDLE_APPROVALAction.java @@ -130,11 +130,12 @@ public class ZOA_SD_CREDIT_HANDLE_APPROVALAction extends BaseBean implements Act String wfid = request.getWorkflowid(); // tablename = unit.getTablename(wfid); tablename = request.getRequestManager().getBillTableName(); - String logsql = "update " + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId; + String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where id = " + requestId; logger_d591fda6.info(String.valueOf("logsql:" + logsql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(logsql, poolname); + boolean b = rs.executeSql(logsql, poolname); + logger_d591fda6.info(String.valueOf("b--" + b)); logger_d591fda6.info(String.valueOf("ZOA_SD_CREDIT_HANDLE_APPROVALAction-Request: " + requestId + "完成")); if (!sta.equals("S")) { request.getRequestManager().setMessageid("100001"); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_DP_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_DP_Action.java index 3e831b8..021a6f2 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_DP_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_DP_Action.java @@ -217,11 +217,12 @@ public class ZOA_SL_DP_Action extends BaseBean implements Action, EsbServerlessR message = "--携程接口回写说明--ReturnStatus:" + strreturn[0] + "；ReturnERRORMessage:" + strreturn[1] + "；ReturnErrorCode:" + strreturn[2]; message = message.replace("'", "’"); if (!tablename.equals("")) { - String logsql2 = "update " + tablename + " set status ='" + status + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where requestId = " + reid; + String logsql2 = "update e10_core_business.dbo." + tablename + " set status ='" + status + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where id = " + reid; logger_a5b8e7d5.info(String.valueOf("logsql2:" + logsql2)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs1.executeSql(logsql2, poolname); + boolean b = rs1.executeSql(logsql2, poolname); + logger_a5b8e7d5.info(String.valueOf("b1:" + b)); } } catch (Exception e) { logger_a5b8e7d5.info(String.valueOf("Exception:" + e.getMessage())); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GNCC_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GNCC_Action.java index fd2577c..ada0338 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GNCC_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GNCC_Action.java @@ -637,11 +637,12 @@ public class ZOA_SL_GNCC_Action extends BaseBean implements Action, EsbServerles message = "--携程接口回写说明--ReturnStatus:" + strreturn[0] + "；ReturnERRORMessage:" + strreturn[1] + "；ReturnErrorCode:" + strreturn[2]; message = message.replace("'", "’"); if (!tablename.equals("")) { - String logsql2 = "update " + tablename + " set status ='" + status + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where requestId = " + reid; + String logsql2 = "update e10_core_business.dbo." + tablename + " set status ='" + status + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where id = " + reid; logger_5e8d517a.info(String.valueOf("logsql2:" + logsql2)); String poolname_yg = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs1.executeSql(logsql2, poolname_yg); + boolean b1 = rs1.executeSql(logsql2, poolname_yg); + logger_5e8d517a.info(String.valueOf("b1:" + b1)); } } catch (Exception e) { logger_5e8d517a.info(String.valueOf(reid + "携程接口Exception:" + e.getMessage())); @@ -715,11 +716,12 @@ public class ZOA_SL_GNCC_Action extends BaseBean implements Action, EsbServerles } message = "--同程接口回写说明--ReturnStatus:" + dTtrip[0] + "；ReturnMessage:" + dTtrip[1] + "；出差单号:" + dTtrip[2]; message = message.replace("'", "’"); - String logsql4 = "update " + tablename + " set status ='" + dTtrip[0] + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where requestId = " + reid; + String logsql4 = "update e10_core_business.dbo." + tablename + " set status ='" + dTtrip[0] + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where id = " + reid; logger_5e8d517a.info(String.valueOf("logsql4:" + logsql4)); String poolname_m6 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs1.executeSql(logsql4, poolname_m6); + boolean b1 = rs1.executeSql(logsql4, poolname_m6); + logger_5e8d517a.info(String.valueOf("b1:" + b1)); } catch (Exception e) { e.printStackTrace(); logger_5e8d517a.info(String.valueOf(reid + "同程商旅接口Exception:" + e.getMessage())); @@ -773,6 +775,7 @@ public class ZOA_SL_GNCC_Action extends BaseBean implements Action, EsbServerles Long recodId1 = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee);// 获取插入的空的建模id String sql3 = "update e10_common.dbo.sync_eas_log set requestId = '" + reid + "',lcbh = '" + sourceKey + "',kssj='" + kssj + "',jssj='" + jssj + "',sqrq='" + sqrq + "',ccmdd='" + attribute8 + "',gh='" + errandEmpNum + "',name='" + attribute3 + "',sxrgh='" + synergeticNumbers + "' " + ",sxrxm='" + synergeticNames + "',reason='" + reason + "',title='" + title + "',sqbm='" + attribute4 + "',sqdw='" + attribute5 + "',status='" + sta + "',message='" + message + "' where id = " + recodId1 + " and delete_type = 0 "; boolean b1 = rs.executeSql(sql3, poolname_5v); + logger_5e8d517a.info(String.valueOf("b1:" + b1)); logger_5e8d517a.info(String.valueOf(reid + "同步数据到EAS完成")); } catch (Exception e) { message = e.getMessage(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GN_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GN_Action.java index d7f59c3..d3722ce 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GN_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GN_Action.java @@ -493,11 +493,12 @@ public class ZOA_SL_GN_Action extends BaseBean implements Action, EsbServerlessR message = "--携程接口回写说明--ReturnStatus:" + strreturn[0] + "；ReturnERRORMessage:" + strreturn[1] + "；ReturnErrorCode:" + strreturn[2]; message = message.replace("'", "’"); if (!tablename.equals("")) { - String logsql2 = "update " + tablename + " set status ='" + status + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where requestId = " + reid; + String logsql2 = "update e10_core_business.dbo." + tablename + " set status ='" + status + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where id = " + reid; logger_92c3db1a.info(String.valueOf("logsql2:" + logsql2)); String poolname_xv = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs1.executeSql(logsql2, poolname_xv); + boolean b = rs1.executeSql(logsql2, poolname_xv); + logger_92c3db1a.info(String.valueOf("b--" + b)); } } catch (Exception e) { e.printStackTrace(); @@ -567,11 +568,12 @@ public class ZOA_SL_GN_Action extends BaseBean implements Action, EsbServerlessR String[] dTtrip = dTtripService.optForDTtrip(map); message = "--同程接口回写说明--ReturnStatus:" + dTtrip[0] + "；ReturnMessage:" + dTtrip[1] + "；出差单号:" + dTtrip[2]; message = message.replace("'", "’"); - String logsql4 = "update " + tablename + " set status ='" + dTtrip[0] + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where requestId = " + reid; + String logsql4 = "update e10_core_business.dbo." + tablename + " set status ='" + dTtrip[0] + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where id = " + reid; logger_92c3db1a.info(String.valueOf("logsql4:" + logsql4)); String poolname_65 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs1.executeSql(logsql4, poolname_65); + boolean b = rs1.executeSql(logsql4, poolname_65); + logger_92c3db1a.info(String.valueOf("b--" + b)); } catch (Exception e) { e.printStackTrace(); logger_92c3db1a.info(String.valueOf(reid + "同程商旅接口Exception:" + e.getMessage())); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GW_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GW_Action.java index 5a01198..013efbd 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GW_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GW_Action.java @@ -511,11 +511,12 @@ public class ZOA_SL_GW_Action extends BaseBean implements Action, EsbServerlessR message = "--携程接口回写说明--ReturnStatus:" + strreturn[0] + "；ReturnERRORMessage:" + strreturn[1] + "；ReturnErrorCode:" + strreturn[2]; message = message.replace("'", "’"); if (!tablename.equals("")) { - String logsql2 = "update " + tablename + " set status ='" + status + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where requestId = " + reid; + String logsql2 = "update e10_core_business.dbo." + tablename + " set status ='" + status + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where id = " + reid; logger_39ae6ef1.info(String.valueOf("logsql2:" + logsql2)); String poolname_ym = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs1.executeSql(logsql2, poolname_ym); + boolean b = rs1.executeSql(logsql2, poolname_ym); + logger_39ae6ef1.info("b--" + b); } } catch (Exception e) { logger_39ae6ef1.info(String.valueOf(reid + "携程接口Exception:" + e.getMessage()));