From ce30848c17fc232f05fcaa7d6ee656df6eafebae Mon Sep 17 00:00:00 2001 From: qijirenjian Date: Wed, 19 Mar 2025 19:19:30 +0800 Subject: [PATCH] formdataid --- .../action/ARSPaymentRecepitAction.java | 10 ++++++++-- .../action/AddVenMatExtsToSrmAction.java | 12 +++++++++--- .../workflow/action/DeleteSapGuidAction.java | 6 +++++- .../workflow/action/EasWhiteListAction.java | 9 ++++++++- .../action/EasYszxfpApplyResultAction.java | 19 ++++++++++++------- .../action/HTGD_MES_NonStandardAction.java | 9 ++++++--- .../workflow/action/HTGD_MES_SC03Action.java | 11 +++++++---- .../action/HTGD_MES_SpeedFixAction.java | 8 +++++++- .../action/HTGD_MES_TDLApproveActivon.java | 7 +++++-- .../workflow/action/HTGD_SW_OaBackAction.java | 7 ++++++- .../workflow/action/Iur_syncProject.java | 9 ++++++--- .../workflow/action/LastOperateAction.java | 7 +++++-- .../workflow/action/OA_CMZ_Action.java | 9 +++++++-- .../workflow/action/OaCrmZDYWFPAction.java | 7 ++++++- .../OaMesNewMaterialCertificationAction.java | 7 ++++++- .../action/OaMesNewMaterialProjectAction.java | 7 +++++-- .../action/OaMesNewMaterialTSBGAction.java | 6 +++++- .../action/OaMesNewMaterialTestAction.java | 7 +++++-- .../action/OaSrmCheckMallApproveAction.java | 17 ++++++----------- .../action/OaSrmCheckMallRefuseAction.java | 10 ++++++++-- .../action/OaSrmCheckPriceApproveAction.java | 10 +++++++++- .../action/OaSrmCheckPriceRefuseAction.java | 9 ++++++++- .../action/OaSrmVendorAdmitAction.java | 3 ++- .../action/OaSrmVendorCheckAction.java | 7 ++++--- .../action/OaSrmVendorReapplyAction.java | 5 +++-- .../action/OaSrmVendorSyncAction.java | 5 +++-- .../workflow/action/OperateAccountAction.java | 11 +++++++---- .../action/OperateEmailAccountAction.java | 9 ++++++--- .../action/OperateMesAccountAction.java | 10 +++++++--- .../action/SY_WLPS_NEW_RETURNAction.java | 11 +++++++---- .../workflow/action/SY_WLPS_RETURNAction.java | 9 +++++++-- .../action/SY_WLPS_RETURNNewAction.java | 11 +++++++---- .../action/TransferBillToK3Action.java | 9 +++++---- .../workflow/action/UpdateFwInfoAction.java | 7 ++++++- .../workflow/action/ZOA_CCSQ_AQJB_Action.java | 8 ++++++-- .../action/ZOA_FICO_ANLA_CHANGEAction.java | 7 +++++-- .../action/ZOA_FICO_COC_CREATIONAction.java | 8 +++++++- .../ZOA_FI_CUSTOMER_MAINTAINAction.java | 9 ++++++--- .../action/ZOA_FI_IORD_RFC_Action.java | 6 +++++- .../ZOA_FI_VENDOR_MAINTAIN_GYSAction.java | 9 ++++++--- .../action/ZOA_MM_PR_CREATE_BpAction.java | 7 +++++-- .../action/ZOA_MM_PR_CREATE_FYH_BgAction.java | 6 +++++- .../action/ZOA_MM_PR_CREATE_FYH_FyAction.java | 6 +++++- .../ZOA_MM_PR_CREATE_GDZC_ZcAction.java | 8 ++++++-- .../action/ZOA_MM_PR_CREATE_JGJ_JgAction.java | 7 +++++-- .../action/ZOA_MM_PR_CREATE_LbAction.java | 6 +++++- .../action/ZOA_MM_PR_CREATE_SCXAction.java | 7 ++++++- .../action/ZOA_MM_PR_CREATE_WWJGAction.java | 7 +++++-- .../action/ZOA_MM_PR_CREATE_YFAction.java | 7 +++++-- .../ZOA_MM_PR_CREATE_YFFY_ZjAction.java | 8 +++++++- .../ZOA_MM_PR_CREATE_ZJGC_ZjAction.java | 7 +++++-- .../action/ZOA_MM_PR_RELEASEAction.java | 2 +- .../ZOA_MM_ZMMT002_FASTCONFIG_Action.java | 7 ++++++- .../ZOA_SD_CREDIT_HANDLE_APPROVALAction.java | 4 +++- .../ZOA_SD_CREDIT_HANDLE_QUERYAction.java | 8 ++++++-- .../workflow/action/ZOA_SL_DP_Action.java | 8 ++++++-- .../workflow/action/ZOA_SL_GNCC_Action.java | 5 +++-- .../workflow/action/ZOA_SL_GN_Action.java | 9 +++++++-- .../workflow/action/ZOA_SL_GWCC_Action.java | 7 ++++--- .../workflow/action/ZOA_SL_GW_Action.java | 9 ++++++--- .../ZOEM_PRICE_DIFFERENCE_RATE_Action.java | 7 ++++++- .../workflow/action/ZSRM_PUR_INFO_Action.java | 6 +++++- .../action/ZSRM_PUR_INFO_GY132_Action.java | 8 ++++++-- .../action/ZSR_PUR_INFO_OEM_Action.java | 6 ++++-- .../EasTzlhtSpzfApplicationService.java | 7 +++++-- .../VendorPunishApplicationService.java | 9 +++++++-- 66 files changed, 382 insertions(+), 143 deletions(-) diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java index b507325..799368f 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java @@ -2,6 +2,7 @@ package com.weaver.seconddev.interfaces.workflow.action; import com.alibaba.fastjson.JSONObject; import com.weaver.seconddev.interfaces.prop.ConfigProp; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.general.StringUtil; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; @@ -39,6 +40,10 @@ public class ARSPaymentRecepitAction extends BaseBean implements Action, EsbServ private RequestInfo requestInfoTemp; @Autowired private ConfigProp configProp; + + @Autowired + private CommonDevUtil commonDevUtil; + private static final Logger logger_c29b3679 = LoggerFactory.getLogger(ARSPaymentRecepitAction.class); String operate; @@ -173,9 +178,10 @@ public class ARSPaymentRecepitAction extends BaseBean implements Action, EsbServ } else { if ("2".equals(newoperate)) { // 正式formtable_main_2714,测试formtable_main_2252，formtable_main_2401 - boolean billingno = rs.execute("update e10_core_business.dbo.formtable_main_2714 set hkdh='" + ret.get("billingno") + "' where id=" + requestid); + String dataid = commonDevUtil.getidByrequestid(requestid); + boolean billingno = rs.execute("update e10_core_business.dbo.formtable_main_2714 set hkdh='" + ret.get("billingno") + "' where FORM_DATA_ID = " + dataid); logger_c29b3679.error( "ret--" + ret.toString()) ; - logger_c29b3679.error("sql　＝　" +"update e10_core_business.dbo.formtable_main_2714 set hkdh='" + ret.get("billingno") + "' where id=" + requestid); + logger_c29b3679.error("sql　＝　" +"update e10_core_business.dbo.formtable_main_2714 set hkdh='" + ret.get("billingno") + "' where FORM_DATA_ID = " + dataid); logger_c29b3679.error("billingno　＝　" +billingno); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmAction.java index 081b2bc..4d73373 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmAction.java @@ -1,6 +1,7 @@ package com.weaver.seconddev.interfaces.workflow.action; import com.weaver.seconddev.interfaces.htjt.util.TransUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import org.apache.commons.lang.StringEscapeUtils; import com.weaver.seconddev.interfaces.srmoa.*; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; @@ -43,7 +44,8 @@ public class AddVenMatExtsToSrmAction extends BaseBean implements Action, EsbSer @Autowired private CallSrmVenMatExtsSevices service; - + @Autowired + private CommonDevUtil commonDevUtil; private static final Logger logger_336cd654 = LoggerFactory.getLogger(AddVenMatExtsToSrmAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -57,6 +59,8 @@ public class AddVenMatExtsToSrmAction extends BaseBean implements Action, EsbSer try { // 流程请求ID String requestId = request.getRequestid(); + + String dataid = commonDevUtil.getidByrequestid(requestId); BillFieldUtil unit = new BillFieldUtil(); // 工作流ID String workFlowId = request.getWorkflowid(); @@ -229,7 +233,8 @@ public class AddVenMatExtsToSrmAction extends BaseBean implements Action, EsbSer return WeaResult.fail(500, "执行失败，GY137供应商新货源扩充接口数据返回值：" + isTat + "--" + msg, getResultMapForAction(weaverResultMap, "result", FAILURE_AND_CONTINUE, request.getRequestManager())); } // RecordSet rs = new RecordSet(); - String sql = "update e10_core_business.dbo." + tablename + " set state='" + isTat + "',message='" + msg + "' where id=" + requestId; + + String sql = "update e10_core_business.dbo." + tablename + " set state='" + isTat + "',message='" + msg + "' where FORM_DATA_ID = " + dataid; logger_336cd654.error("sql == "+sql); String poolname_c1 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -240,7 +245,8 @@ public class AddVenMatExtsToSrmAction extends BaseBean implements Action, EsbSer request.getRequestManager().setMessagecontent("SRM接口返回错误信息：" + e.toString()); logger_336cd654.error(String.valueOf(requestId + "AddVenMatExtsToSrmAction-Request出错: " + e.toString())); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "update e10_core_business.dbo." + tablename + " set state='E',message='" + e.getMessage() + "' where id=" + requestId; + + String sql = "update e10_core_business.dbo." + tablename + " set state='E',message='" + e.getMessage() + "' where FORM_DATA_ID = " + dataid; logger_336cd654.error("sql == "+sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 63482c2..f6f6bbd 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 @@ -1,6 +1,7 @@ package com.weaver.seconddev.interfaces.workflow.action; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -25,6 +26,8 @@ public class DeleteSapGuidAction extends BaseBean implements Action, EsbServerle // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; + @Autowired + private CommonDevUtil commonDevUtil; private static final Logger logger_5b06e417 = LoggerFactory.getLogger(DeleteSapGuidAction.class); @@ -47,6 +50,7 @@ public class DeleteSapGuidAction extends BaseBean implements Action, EsbServerle // 表单名称 String tablename = request.getRequestManager().getBillTableName(); String requestid = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestid); String workflowid = request.getWorkflowid(); String xxid = ""; Property[] aproperty = request.getMainTableInfo().getProperty(); @@ -87,7 +91,7 @@ public class DeleteSapGuidAction extends BaseBean implements Action, EsbServerle String state = result[0]; String message = result[1]; // 把返回的值存到流程中 - String sql = (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(); + String sql = (new StringBuilder()).append("update e10_core_business.dbo.").append(tablename).append(" set sta ='").append(state).append("', meg = '").append(message).append("' where FORM_DATA_ID = ").append(dataid).toString(); logger_5b06e417.error(String.valueOf((new StringBuilder()).append("logsql:").append(sql).toString())); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 23b6651..b2e0794 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 @@ -1,6 +1,7 @@ package com.weaver.seconddev.interfaces.workflow.action; import com.weaver.seconddev.interfaces.prop.ConfigProp; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import org.apache.axis2.kernel.http.HTTPConstants; import org.apache.axis2.transport.http.HttpTransportProperties; import com.weaver.seconddev.interfaces.easoa.SI_WhitelistSync_OUTServiceStub; @@ -34,6 +35,9 @@ public class EasWhiteListAction extends BaseBean implements Action, EsbServerles private RequestInfo requestInfoTemp; @Autowired private ConfigProp configProp; + @Autowired + private CommonDevUtil commonDevUtil; + private static final Logger logger_b5430ca5 = LoggerFactory.getLogger(EasWhiteListAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -46,6 +50,9 @@ public class EasWhiteListAction extends BaseBean implements Action, EsbServerles logger_b5430ca5.error("userIdTemp == " +userIdTemp); try { String requestid = request.getRequestid(); + + String dataid = commonDevUtil.getidByrequestid(requestid); + String tablename = ""; String wfid = request.getWorkflowid(); BillFieldUtil unit = new BillFieldUtil(); @@ -54,7 +61,7 @@ public class EasWhiteListAction extends BaseBean implements Action, EsbServerles String id = ""; try { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "select id from e10_core_business.dbo." + tablename + " where id='" + requestid + "'"; + String sql = "select id from e10_core_business.dbo." + tablename + " where FORM_DATA_ID ='" + dataid + "'"; logger_b5430ca5.error("sql == "+sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasYszxfpApplyResultAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasYszxfpApplyResultAction.java index 38e6cce..a926738 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasYszxfpApplyResultAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasYszxfpApplyResultAction.java @@ -8,6 +8,7 @@ import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import java.util.HashMap; import java.util.Map; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -37,7 +38,8 @@ public class EasYszxfpApplyResultAction extends BaseBean implements Action, EsbS // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private CommonDevUtil commonDevUtil; @Autowired private EAS_YszxfpApplyResult mGetResult; private static final Logger logger_59285be7 = LoggerFactory.getLogger(EasYszxfpApplyResultAction.class); @@ -55,17 +57,20 @@ public class EasYszxfpApplyResultAction extends BaseBean implements Action, EsbS String boeHeaderId = ""; String tablename = ""; RecordSet rs = I18nContextUtil.getBean(RecordSet.class); + requestID = requestInfo.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestID); BillFieldUtil unit = new com.weaver.seconddev.interfaces.swfa.BillFieldUtil(); try { logger_59285be7.error(String.valueOf("EasYszxfpApplyResultAction--start--" + requestID)); logger_59285be7.error("requestIdTemp == " +requestIdTemp); logger_59285be7.error("userIdTemp == " +userIdTemp); Property[] properties = requestInfo.getMainTableInfo().getProperty(); - requestID = requestInfo.getRequestid(); + + String wfid = requestInfo.getWorkflowid(); // tablename = unit.getTablename(wfid); tablename = requestInfo.getRequestManager().getBillTableName(); - String sql = "select id,sfdy from e10_core_business.dbo." + tablename + " where id =" + requestID; + String sql = "select id,sfdy from e10_core_business.dbo." + tablename + " where FORM_DATA_ID = " + dataid; logger_59285be7.error("sql == " +sql); String poolname_l4 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -78,7 +83,7 @@ public class EasYszxfpApplyResultAction extends BaseBean implements Action, EsbS } else { String poolname_r6 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - String sql2 = "update e10_core_business.dbo." + tablename + " set sfdy = 0 where id = " + requestID; + String sql2 = "update e10_core_business.dbo." + tablename + " set sfdy = 0 where FORM_DATA_ID = " + dataid; logger_59285be7.error("sql2 == " +sql2); boolean b = rs.executeSql(sql2, poolname_r6); logger_59285be7.error("b == " +b); @@ -192,7 +197,7 @@ public class EasYszxfpApplyResultAction extends BaseBean implements Action, EsbS String poolname_so = CONN_TYPE.workflow.getType(); // 失败 // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - String sql3 = "update e10_core_business.dbo." + tablename + " set sfdy = 1 where id = " + requestID; + String sql3 = "update e10_core_business.dbo." + tablename + " set sfdy = 1 where FORM_DATA_ID = " + dataid; logger_59285be7.error("sql3"+sql3); boolean b = rs.executeSql(sql3, poolname_so); logger_59285be7.error("b2"+b); @@ -204,7 +209,7 @@ public class EasYszxfpApplyResultAction extends BaseBean implements Action, EsbS } else { String poolname_b5 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - String sql4 = "update e10_core_business.dbo." + tablename + " set sfdy = 1 where id = " + requestID; + String sql4 = "update e10_core_business.dbo." + tablename + " set sfdy = 1 where FORM_DATA_ID = " + dataid; logger_59285be7.error("sql4"+sql4); boolean b = rs.executeSql(sql4, poolname_b5); logger_59285be7.error("b3"+b); @@ -212,7 +217,7 @@ public class EasYszxfpApplyResultAction extends BaseBean implements Action, EsbS } catch (Exception e) { String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - String sql5 = "update e10_core_business.dbo." + tablename + " set sfdy = 1 where id = " + requestID; + String sql5 = "update e10_core_business.dbo." + tablename + " set sfdy = 1 where FORM_DATA_ID = " + dataid; logger_59285be7.error("sql5"+sql5); boolean b = rs.executeSql(sql5, poolname); logger_59285be7.error("b4"+b); 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 a2e9406..45421a8 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 @@ -1,5 +1,6 @@ package com.weaver.seconddev.interfaces.workflow.action; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import org.json.JSONObject; import com.weaver.seconddev.interfaces.oames.ReturnMesWLPS_SYService; import com.weaver.seconddev.interfaces.oames.SI_OA_HTOAApproFlowSync_OUTServiceStub; @@ -33,7 +34,8 @@ public class HTGD_MES_NonStandardAction extends BaseBean implements Action, EsbS // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private CommonDevUtil commonDevUtil; @Autowired private ReturnMesWLPS_SYService service; private static final Logger logger_c8d15d65 = LoggerFactory.getLogger(HTGD_MES_NonStandardAction.class); @@ -46,6 +48,7 @@ public class HTGD_MES_NonStandardAction extends BaseBean implements Action, EsbS RequestInfo requestInfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); try { String requestId = requestInfo.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestId); logger_c8d15d65.error(String.valueOf("HTGD_MES_NonStandardAction--" + requestId + "开始执行")); logger_c8d15d65.error("requestIdTemp == " +requestIdTemp); logger_c8d15d65.error("userIdTemp == " +userIdTemp); @@ -97,7 +100,7 @@ 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 e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where id=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where FORM_DATA_ID = " + dataid; String poolname_ar = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 boolean b = rs.executeSql(sql, poolname_ar); @@ -107,7 +110,7 @@ public class HTGD_MES_NonStandardAction extends BaseBean implements Action, EsbS } catch (Exception exception) { logger_c8d15d65.error(String.valueOf("HTGD_MES_NonStandardAction--" + requestId + "执行出错：" + exception.getMessage())); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "update e10_core_business.dbo." + tablename + " set state='E',message='" + exception.getMessage() + "' where id=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set state='E',message='" + exception.getMessage() + "' where FORM_DATA_ID = " + dataid; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 boolean b = rs.executeSql(sql, poolname); 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 bd26718..e9843d9 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 @@ -2,6 +2,7 @@ package com.weaver.seconddev.interfaces.workflow.action; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import org.apache.commons.lang.StringEscapeUtils; import com.weaver.seconddev.interfaces.oames.ReturnMesWLPS_SYService; import com.weaver.seconddev.interfaces.oames.SI_OA_HTOAApproFlowSync_OUTServiceStub; @@ -37,7 +38,8 @@ public class HTGD_MES_SC03Action extends BaseBean implements Action, EsbServerle // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private CommonDevUtil commonDevUtil; @Autowired private ReturnMesWLPS_SYService service; private static final Logger logger_1ea91e04 = LoggerFactory.getLogger(HTGD_MES_SC03Action.class); @@ -49,6 +51,7 @@ public class HTGD_MES_SC03Action extends BaseBean implements Action, EsbServerle RequestInfo requestinfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); try { String requestId = requestinfo.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestId); try { String requestName = requestinfo.getRequestManager().getRequestname(); String creatorId = requestinfo.getCreatorid(); @@ -85,7 +88,7 @@ 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 e10_core_business.dbo.wfc_requestlog a " + "INNER JOIN employee b on a.creator = b.id " + "where id = " + 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方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -100,7 +103,7 @@ public class HTGD_MES_SC03Action extends BaseBean implements Action, EsbServerle mjson.put("sqbmyj", sqbmyj); } // 获取受理部门审核记录 - 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 id = " + 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方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -166,7 +169,7 @@ 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方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - boolean b2 = rs.executeSql("update e10_core_business.dbo" + tablename + " set state='E',message='" + ret[1] + "' where id=" + requestId, poolname_ig); + boolean b2 = rs.executeSql("update e10_core_business.dbo" + tablename + " set state='E',message='" + ret[1] + "' where FORM_DATA_ID = " + dataid, poolname_ig); logger_1ea91e04.error("b2 -----"+ b2); } } catch (Exception exception) { 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 6a4f2d7..19b2ef5 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 @@ -10,6 +10,7 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -37,6 +38,10 @@ public class HTGD_MES_SpeedFixAction extends BaseBean implements Action, EsbServ // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; + + @Autowired + private CommonDevUtil commonDevUtil; + @Autowired private ReturnMesWLPS_SYService service; private static final Logger logger_d0d39a5f = LoggerFactory.getLogger(HTGD_MES_SpeedFixAction.class); @@ -48,6 +53,7 @@ public class HTGD_MES_SpeedFixAction extends BaseBean implements Action, EsbServ RequestInfo requestinfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); try { String requestId = requestinfo.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestId); try { String requestName = requestinfo.getRequestManager().getRequestname(); String creatorId = requestinfo.getCreatorid(); @@ -120,7 +126,7 @@ 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方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - boolean b = rs.executeSql("update e10_core_business.dbo." + tablename + " set state='E',message='" + ret[1] + "' where id=" + requestId, poolname); + boolean b = rs.executeSql("update e10_core_business.dbo." + tablename + " set state='E',message='" + ret[1] + "' where FORM_DATA_ID = " + dataid, poolname); logger_d0d39a5f.error(String.valueOf(requestId + "-HTGD_MES_SpeedFixAction update:" + b)); } } catch (Exception exception) { 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 6f71427..0e5f894 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 @@ -5,6 +5,7 @@ import com.weaver.seconddev.interfaces.oames.SI_OA_HTOAApproFlowSync_OUTService import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import java.util.UUID; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -33,7 +34,8 @@ public class HTGD_MES_TDLApproveActivon extends BaseBean implements Action, EsbS // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private CommonDevUtil commonDevUtil; @Autowired private ReturnMesWLPS_SYService service; private static final Logger logger_674a8052 = LoggerFactory.getLogger(HTGD_MES_TDLApproveActivon.class); @@ -45,6 +47,7 @@ public class HTGD_MES_TDLApproveActivon extends BaseBean implements Action, EsbS RequestInfo requestinfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); try { String requestId = requestinfo.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestId); try { String requestName = requestinfo.getRequestManager().getRequestname(); String creatorId = requestinfo.getCreatorid(); @@ -88,7 +91,7 @@ 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方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - boolean b = rs.executeSql("update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where id=" + requestId, poolname); + boolean b = rs.executeSql("update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where FORM_DATA_ID = " + dataid , poolname); if (b) { logger_674a8052.error(String.valueOf(requestId + "-HTGD_MES_TDLApproveActivon update success")); } else { 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 74dee6b..d551401 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 @@ -5,6 +5,7 @@ import com.weaver.seconddev.interfaces.oames.CallMesKeSuService; import com.weaver.seconddev.interfaces.oames.OA_KSJXCL_SERVICEStub; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -39,6 +40,9 @@ public class HTGD_SW_OaBackAction extends BaseBean implements Action, EsbServerl @Autowired private RequestInfo requestInfoTemp; + @Autowired + private CommonDevUtil commonDevUtil; + private static final Logger logger_e4a191d3 = LoggerFactory.getLogger(HTGD_SW_OaBackAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -104,6 +108,7 @@ public class HTGD_SW_OaBackAction extends BaseBean implements Action, EsbServerl // 流程请求ID String requestId = request.getRequestid(); logger_e4a191d3.error(String.valueOf("获取requestId:=" + requestId)); + String dataid = commonDevUtil.getidByrequestid(requestId); // 工作流ID String Id = request.getWorkflowid(); // 主表字段赋值 @@ -368,7 +373,7 @@ 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 e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where id = " + requestId; + String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where FORM_DATA_ID = " + dataid; logger_e4a191d3.error(String.valueOf("logsql:" + logsql)); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); 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 f8f9f14..6842952 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 @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.weaver.seconddev.interfaces.iuroa.SyncDataService; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -29,7 +30,8 @@ public class Iur_syncProject extends BaseBean implements Action, EsbServerlessRp // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private CommonDevUtil commonDevUtil; @Autowired private SyncDataService service; @@ -43,6 +45,7 @@ public class Iur_syncProject extends BaseBean implements Action, EsbServerlessRp RequestInfo requestinfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); try { String requestid = requestinfo.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestid); String workflowid = requestinfo.getWorkflowid(); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); BillFieldUtil util = new BillFieldUtil(); @@ -78,7 +81,7 @@ public class Iur_syncProject extends BaseBean implements Action, EsbServerlessRp logger_72949ae6.error(String.valueOf(requestid + "--Iur_syncProject--info:[" + result[0] + "|" + result[1] + "]")); String poolname_9l = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - boolean b = rs.executeSql("update e10_core_business.dbo." + tablename + " set status='" + result[0] + "',message='" + result[1] + "' where id=" + requestid, poolname_9l); + boolean b = rs.executeSql("update e10_core_business.dbo." + tablename + " set status='" + result[0] + "',message='" + result[1] + "' where FORM_DATA_ID = " + dataid, poolname_9l); if (b) { logger_72949ae6.error(String.valueOf(requestid + "--Iur_syncProject--update success")); } else { @@ -88,7 +91,7 @@ public class Iur_syncProject extends BaseBean implements Action, EsbServerlessRp logger_72949ae6.error(String.valueOf("Iur_syncProject--error:" + e.toString())); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - boolean b = rs.executeSql("update e10_core_business.dbo." + tablename + " set status='E',message='" + e.toString() + "' where id=" + requestid, poolname); + boolean b = rs.executeSql("update e10_core_business.dbo." + tablename + " set status='E',message='" + e.toString() + "' where FORM_DATA_ID = " + dataid, poolname); if (b) { logger_72949ae6.error(String.valueOf(requestid + "--Iur_syncProject--update success")); return WeaResult.fail(500, requestid + "--Iur_syncProject--update success" + e, getResultMapForAction(weaverResultMap, "result",e.getMessage(), requestinfo.getRequestManager())); 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 f86a96f..a5f0e6e 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 @@ -9,6 +9,7 @@ import java.text.*; import java.math.*; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import com.weaver.verupgrade.workflow.request.RequestManager; @@ -44,7 +45,8 @@ public class LastOperateAction extends BaseBean implements Action, EsbServerless // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private CommonDevUtil commonDevUtil; private static final Logger logger_e95a7685 = LoggerFactory.getLogger(LastOperateAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -61,6 +63,7 @@ public class LastOperateAction extends BaseBean implements Action, EsbServerless WorkflowComInfo wkfl = I18nContextUtil.getBean(WorkflowComInfo.class); // 流程请求ID String reid = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(reid); String workflowid = request.getWorkflowid(); // 获取审批人姓名 @@ -68,7 +71,7 @@ public class LastOperateAction extends BaseBean implements Action, EsbServerless // String tablename = wkbl.getTablename(wkfl.getFormId(workflowid)); String tablename = request.getRequestManager().getBillTableName(); logger_e95a7685.error("workflow_action_LastOperateAction tablename==>",tablename); - String logsql = "update e10_core_business.dbo." + tablename + " set spr = '" + spr + "' where id = " + reid; + String logsql = "update e10_core_business.dbo." + tablename + " set spr = '" + spr + "' where FORM_DATA_ID = " + dataid; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 boolean b = rs1.executeSql(logsql, poolname); 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 8cce5e9..2c21650 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 @@ -1,6 +1,8 @@ package com.weaver.seconddev.interfaces.workflow.action; import java.rmi.RemoteException; + +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import org.apache.axis2.AxisFault; import com.weaver.seconddev.interfaces.oames.CallMesChuMenZhengService; import com.weaver.seconddev.interfaces.oames.OA_CMZ_SERVICEStub; @@ -34,7 +36,8 @@ public class OA_CMZ_Action extends BaseBean implements Action, EsbServerlessRpcR // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private CommonDevUtil commonDevUtil; @Autowired private CallMesChuMenZhengService mes; private static final Logger logger_44f7fe13 = LoggerFactory.getLogger(OA_CMZ_Action.class); @@ -51,6 +54,8 @@ public class OA_CMZ_Action extends BaseBean implements Action, EsbServerlessRpcR try { logger_44f7fe13.error(String.valueOf("开始获取取流程信息")); String requestid = requestinfo.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestid); + String requestname = requestinfo.getRequestManager().getRequestname(); Property[] properties = requestinfo.getMainTableInfo().getProperty(); User user = requestinfo.getRequestManager().getUser(); @@ -120,7 +125,7 @@ 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 e10_core_business.dbo." + tablename + " set status ='" + sta + "', message = '" + meg + "' where id = " + requestid; + String logsql = "update e10_core_business.dbo." + tablename + " set status ='" + sta + "', message = '" + meg + "' where FORM_DATA_ID = " + dataid; logger_44f7fe13.error(String.valueOf("logsql:" + logsql)); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); 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 498ac13..d4db324 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 @@ -7,6 +7,7 @@ import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import java.util.HashMap; import java.util.Map; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import org.springframework.core.env.Environment; import java.lang.*; @@ -37,6 +38,9 @@ public class OaCrmZDYWFPAction extends BaseBean implements Action, EsbServerless private RequestInfo requestInfoTemp; @Autowired private ConfigProp configProp; + @Autowired + private CommonDevUtil commonDevUtil; + private static final Logger logger_afe2c4b5 = LoggerFactory.getLogger(OaCrmZDYWFPAction.class); @Override @@ -54,6 +58,7 @@ public class OaCrmZDYWFPAction extends BaseBean implements Action, EsbServerless logger_afe2c4b5.error(String.valueOf("OaCrmZDYWFPAction--start--" + requestID)); Property[] properties = requestInfo.getMainTableInfo().getProperty(); requestID = requestInfo.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestID); workflowID = requestInfo.getWorkflowid(); BillFieldUtil util = new BillFieldUtil(); // tablename = util.getTablename(workflowID); @@ -129,7 +134,7 @@ public class OaCrmZDYWFPAction extends BaseBean implements Action, EsbServerless requestInfo.getRequestManager().setMessagecontent("CRM返回错误信息：" + srMessage); } else { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "update e10_core_business.dbo." + tablename + " set jssqdh='" + goldenNum + "' where id=" + requestID; + String sql = "update e10_core_business.dbo." + tablename + " set jssqdh='" + goldenNum + "' where FORM_DATA_ID = " + dataid; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 boolean b = rs.executeSql(sql, poolname); 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 6243b6c..16271ec 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 @@ -5,6 +5,7 @@ import com.weaver.seconddev.interfaces.oames.CallMesNewMaterialCertificationSer import com.weaver.seconddev.interfaces.oames.OA_KSJXCL_SERVICEStub; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -37,6 +38,8 @@ public class OaMesNewMaterialCertificationAction extends BaseBean implements Act @Autowired private RequestInfo requestInfoTemp; + @Autowired + private CommonDevUtil commonDevUtil; private static final Logger logger_7ab25493 = LoggerFactory.getLogger(OaMesNewMaterialCertificationAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -113,6 +116,8 @@ public class OaMesNewMaterialCertificationAction extends BaseBean implements Act String gys6 = " "; // 流程请求ID String requestId = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestId); + // 主表字段赋值 // 获取表单主字段信息 Property[] properties = request.getMainTableInfo().getProperty(); @@ -540,7 +545,7 @@ public class OaMesNewMaterialCertificationAction extends BaseBean implements Act String wfid = request.getWorkflowid(); // tablename = unit.getTablename(wfid); tablename = request.getRequestManager().getBillTableName(); - String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where id = " + requestId; + String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where FORM_DATA_ID = " + dataid; logger_7ab25493.error(String.valueOf("logsql:" + logsql)); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); 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 12d3c1c..9f767b1 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 @@ -5,6 +5,7 @@ import com.weaver.seconddev.interfaces.oames.CallMesNewMaterialProjectService; import com.weaver.seconddev.interfaces.oames.OA_KSJXCL_SERVICEStub; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -33,7 +34,8 @@ public class OaMesNewMaterialProjectAction extends BaseBean implements Action, E // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private CommonDevUtil commonDevUtil; private static final Logger logger_fedc85f2 = LoggerFactory.getLogger(OaMesNewMaterialProjectAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -127,6 +129,7 @@ public class OaMesNewMaterialProjectAction extends BaseBean implements Action, E tbrq = datetype.format(now); // 流程请求ID String requestId = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestId); // 工作流ID String id = request.getWorkflowid(); // 主表字段赋值 @@ -405,7 +408,7 @@ public class OaMesNewMaterialProjectAction extends BaseBean implements Action, E String wfid = request.getWorkflowid(); // tablename = unit.getTablename(wfid); tablename = request.getRequestManager().getBillTableName(); - String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where id = " + requestId; + String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where FORM_DATA_ID = " + dataid; logger_fedc85f2.error(String.valueOf("logsql:" + logsql)); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); 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 a8f1941..a75b05b 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 @@ -4,6 +4,7 @@ import com.weaver.seconddev.interfaces.oames.CallMesNewMaterialTSBGSerivce; import com.weaver.seconddev.interfaces.oames.OA_KSJXCL_SERVICEStub; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -36,6 +37,8 @@ public class OaMesNewMaterialTSBGAction extends BaseBean implements Action, EsbS @Autowired private RequestInfo requestInfoTemp; + @Autowired + private CommonDevUtil commonDevUtil; private static final Logger logger_f52b61d7 = LoggerFactory.getLogger(OaMesNewMaterialTSBGAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -121,6 +124,7 @@ public class OaMesNewMaterialTSBGAction extends BaseBean implements Action, EsbS String[][] prdetail = null; // 流程请求ID String requestId = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestId); // 流程表单id String Id = request.getWorkflowid(); // spr = hr.getResourcename(request.getLastoperator());//获取审批人姓名 @@ -439,7 +443,7 @@ public class OaMesNewMaterialTSBGAction extends BaseBean implements Action, EsbS String wfid = request.getWorkflowid(); // tablename = unit.getTablename(wfid); tablename = request.getRequestManager().getBillTableName(); - String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where id = " + requestId; + String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where FORM_DATA_ID = " + dataid; logger_f52b61d7.error(String.valueOf("logsql:" + logsql)); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); 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 f5fdae7..0b45b7b 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 @@ -4,6 +4,7 @@ import com.weaver.seconddev.interfaces.oames.CallMesNewMaterialTestService; import com.weaver.seconddev.interfaces.oames.OA_KSJXCL_SERVICEStub; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -32,7 +33,8 @@ public class OaMesNewMaterialTestAction extends BaseBean implements Action, EsbS // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private CommonDevUtil commonDevUtil; private static final Logger logger_908d3105 = LoggerFactory.getLogger(OaMesNewMaterialTestAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -101,6 +103,7 @@ public class OaMesNewMaterialTestAction extends BaseBean implements Action, EsbS String id = request.getWorkflowid(); // 流程请求ID String requestId = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestId); // 主表字段赋值 // 获取表单主字段信息 Property[] properties = request.getMainTableInfo().getProperty(); @@ -299,7 +302,7 @@ public class OaMesNewMaterialTestAction extends BaseBean implements Action, EsbS String wfid = request.getWorkflowid(); // tablename = unit.getTablename(wfid); tablename = request.getRequestManager().getBillTableName(); - String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where id = " + requestId; + String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where FORM_DATA_ID = " + dataid; logger_908d3105.error(String.valueOf("logsql:" + logsql)); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); 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 fbf12ac..15d13a6 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 @@ -1,12 +1,9 @@ package com.weaver.seconddev.interfaces.workflow.action; -import java.util.*; -import java.text.*; -import java.math.*; -import java.util.Date; import com.weaver.seconddev.interfaces.srmoa.*; import com.weaver.seconddev.interfaces.swfa.*; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import com.weaver.verupgrade.workflow.request.RequestManager; @@ -19,16 +16,10 @@ import com.weaver.verupgrade.soa.workflow.request.RequestInfo; import java.util.Map; import java.util.HashMap; import com.weaver.verupgrade.conn.RecordSet; -import com.weaver.verupgrade.conn.RecordSetDataSource; -import com.weaver.verupgrade.general.TimeUtil; import com.weaver.verupgrade.general.Util; import com.weaver.verupgrade.interfaces.workflow.action.Action; import com.weaver.verupgrade.soa.workflow.request.Property; -import com.weaver.verupgrade.soa.workflow.request.Cell; -import com.weaver.verupgrade.soa.workflow.request.DetailTable; -import com.weaver.verupgrade.soa.workflow.request.Row; import com.weaver.verupgrade.general.BaseBean; -import com.weaver.verupgrade.hrm.resource.ResourceComInfo; /** * SRM--亨通商城审批接口--libin2017017 @@ -42,6 +33,8 @@ public class OaSrmCheckMallApproveAction extends BaseBean implements Action, Esb private RequestInfo requestInfoTemp; @Autowired private CallSrmCheckMallServices srm ; + @Autowired + private CommonDevUtil commonDevUtil; private static final Logger logger_85b99b44 = LoggerFactory.getLogger(OaSrmCheckMallApproveAction.class); @@ -64,6 +57,8 @@ public class OaSrmCheckMallApproveAction extends BaseBean implements Action, Esb // 流程请求ID requestId = request.getRequestid(); logger_85b99b44.error(String.valueOf("OaSrmCheckMallApproveAction-Request: " + requestId + "开始")); + String dataid = commonDevUtil.getidByrequestid(requestId); + MallPurReqChkServiceServiceStub.MallPurReqIN resultin = new MallPurReqChkServiceServiceStub.MallPurReqIN(); // 封装单据主信息 // 封装表单信息 @@ -103,7 +98,7 @@ public class OaSrmCheckMallApproveAction extends BaseBean implements Action, Esb String wfid = request.getWorkflowid(); // tablename = unit.getTablename(wfid); tablename = request.getRequestManager().getBillTableName(); - String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where id = " + requestId; + String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where FORM_DATA_ID = " + dataid; logger_85b99b44.error(String.valueOf(requestId + " logsql:" + logsql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 a3dcf0c..07711f2 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 @@ -7,6 +7,7 @@ import java.util.Date; import com.weaver.seconddev.interfaces.srmoa.*; import com.weaver.seconddev.interfaces.swfa.*; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import com.weaver.verupgrade.workflow.request.RequestManager; @@ -44,7 +45,8 @@ public class OaSrmCheckMallRefuseAction extends BaseBean implements Action, EsbS @Autowired private CallSrmCheckMallServices srm; - + @Autowired + private CommonDevUtil commonDevUtil; private static final Logger logger_6576dfe9 = LoggerFactory.getLogger(OaSrmCheckMallRefuseAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -65,7 +67,11 @@ public class OaSrmCheckMallRefuseAction extends BaseBean implements Action, EsbS BillFieldUtil unit = new BillFieldUtil(); // 流程请求ID requestId = request.getRequestid(); + + logger_6576dfe9.error(String.valueOf("OaSrmCheckMallRefuseAction-Request: " + requestId + "开始")); + String dataid = commonDevUtil.getidByrequestid(requestId); + MallPurReqChkServiceServiceStub.MallPurReqIN resultin = new MallPurReqChkServiceServiceStub.MallPurReqIN(); // 封装单据主信息 // 封装表单信息 @@ -105,7 +111,7 @@ public class OaSrmCheckMallRefuseAction extends BaseBean implements Action, EsbS String wfid = request.getWorkflowid(); // tablename = unit.getTablename(wfid); tablename = request.getRequestManager().getBillTableName(); - String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where id = " + requestId; + String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where FORM_DATA_ID = " + dataid; logger_6576dfe9.error(String.valueOf(requestId + " logsql:" + logsql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 38652d2..9c2eac1 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 @@ -10,6 +10,7 @@ import com.weaver.seconddev.interfaces.htjt.util.LogUtil; import com.weaver.seconddev.interfaces.srmoa.*; import com.weaver.seconddev.interfaces.swfa.*; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import com.weaver.verupgrade.workflow.request.RequestManager; @@ -47,6 +48,10 @@ public class OaSrmCheckPriceApproveAction extends BaseBean implements Action, Es private LogUtil logUtil; @Autowired private CallSrmCheckPriceServices srm; + + @Autowired + private CommonDevUtil commonDevUtil; + private static final Logger logger_c6c5cea5 = LoggerFactory.getLogger(OaSrmCheckPriceApproveAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -86,6 +91,9 @@ public class OaSrmCheckPriceApproveAction extends BaseBean implements Action, Es // 流程请求ID requestId = request.getRequestid(); logger_c6c5cea5.error("requestId--" + requestId); + String dataid = commonDevUtil.getidByrequestid(requestId); + + lcbh = requestId; shyj = request.getRequestManager().getRemark(); logger_c6c5cea5.error("userIdTemp--" + userIdTemp); @@ -152,7 +160,7 @@ public class OaSrmCheckPriceApproveAction extends BaseBean implements Action, Es String wfid = request.getWorkflowid(); // tablename = unit.getTablename(wfid); tablename = request.getRequestManager().getBillTableName(); - String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where id = " + requestId; + String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where FORM_DATA_ID = " + dataid; logger_c6c5cea5.error(String.valueOf("logsql:" + logsql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 66bacb0..844e1f7 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 @@ -10,6 +10,7 @@ import com.weaver.seconddev.interfaces.htjt.util.LogUtil; import com.weaver.seconddev.interfaces.srmoa.*; import com.weaver.seconddev.interfaces.swfa.*; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import com.weaver.verupgrade.workflow.request.RequestManager; @@ -47,6 +48,10 @@ public class OaSrmCheckPriceRefuseAction extends BaseBean implements Action, Esb private CallSrmCheckPriceServices srm; @Autowired private LogUtil logUtil; + + @Autowired + private CommonDevUtil commonDevUtil; + private static final Logger logger_80563c68 = LoggerFactory.getLogger(OaSrmCheckPriceRefuseAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -85,6 +90,8 @@ public class OaSrmCheckPriceRefuseAction extends BaseBean implements Action, Esb shsj = timetype.format(now); // 流程请求ID requestId = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestId); + lcbh = requestId; shyj = request.getRequestManager().getRemark(); shr = hr.getResourcename(String.valueOf(userIdTemp)); @@ -149,7 +156,7 @@ public class OaSrmCheckPriceRefuseAction extends BaseBean implements Action, Esb String wfid = request.getWorkflowid(); // tablename = unit.getTablename(wfid); tablename = request.getRequestManager().getBillTableName(); - String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where id = " + requestId; + String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where FORM_DATA_ID = " + dataid; logger_80563c68.error(String.valueOf("logsql:" + logsql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 29db9b5..365b5e6 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 @@ -54,6 +54,7 @@ public class OaSrmVendorAdmitAction extends BaseBean implements Action, EsbServe RequestInfo requestinfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); try { String requestid = requestinfo.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestid); String workflowid = requestinfo.getWorkflowid(); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); TransUtil tu = new TransUtil(); @@ -160,7 +161,7 @@ public class OaSrmVendorAdmitAction extends BaseBean implements Action, EsbServe int dtcount = 0; String detailTablename3 = commonDevUtil.getDetailTableName(tablename,"3"); - String sql = "select b.* from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename3 + " b where a.form_data_id=b.form_data_id and a.id=" + requestid; + String sql = "select b.* from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename3 + " b where a.form_data_id=b.form_data_id and a.FORM_DATA_ID = " + dataid; logger_9af84826.error("OaSrmVendorAdmitAction sql-->" + sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 7a76084..a78f164 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 @@ -70,6 +70,7 @@ public class OaSrmVendorCheckAction extends BaseBean implements Action, EsbServe RequestInfo requestinfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); try { String requestid = requestinfo.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestid); String workflowid = requestinfo.getWorkflowid(); TransUtil tu = new TransUtil(); // String tablename = tu.getTableName(workflowid); @@ -191,7 +192,7 @@ public class OaSrmVendorCheckAction extends BaseBean implements Action, EsbServe dlvapplyin.setInspectFlag(xcsh); dlvapplyin.setVendorType(gyslxmc); int dtcount = 0; - String sql = "select b.* from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename3 + " b where a.form_data_id=b.form_data_id and a.id=" + requestid; + String sql = "select b.* from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename3 + " b where a.form_data_id=b.form_data_id and a.FORM_DATA_ID = " + dataid; String poolname_6g = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 boolean b = rs.executeSql(sql, poolname_6g); @@ -249,7 +250,7 @@ public class OaSrmVendorCheckAction extends BaseBean implements Action, EsbServe oainputvendor.setShzt("1"); if (val.equals("0")) { int dtcount = 0; - String sql = "select b.* from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename3 + " b where a.form_data_id=b.form_data_id and a.id=" + requestid; + String sql = "select b.* from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename3 + " b where a.form_data_id=b.form_data_id and a.FORM_DATA_ID = " + dataid; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 boolean b = rs.executeSql(sql, poolname); @@ -302,7 +303,7 @@ 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 e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename2 + " b where a.form_data_id=b.form_data_id and a.id=" + requestid; + String sql = "select distinct wlh from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename2 + " b where a.form_data_id=b.form_data_id and a.FORM_DATA_ID = " + dataid; logger_a864d799.error("sql-->" + sql); String poolname_4c = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 8f7bf7a..a926468 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 @@ -63,6 +63,7 @@ public class OaSrmVendorReapplyAction extends BaseBean implements Action, EsbSer RequestInfo requestinfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); try { String requestid = requestinfo.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestid); String workflowid = requestinfo.getWorkflowid(); TransUtil tu = new TransUtil(); // String tablename = tu.getTableName(workflowid); @@ -161,7 +162,7 @@ public class OaSrmVendorReapplyAction extends BaseBean implements Action, EsbSer oainputvendor.setSyncErp(Integer.valueOf(sftserp)); } int dtcount = 0; - String sql = "select b.* from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename3 + " b where a.form_data_id=b.form_data_id and a.id=" + requestid; + String sql = "select b.* from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename3 + " b where a.form_data_id=b.form_data_id and a.FORM_DATA_ID = " + dataid; logger_a5e612ac.error("sql-->" + sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -242,7 +243,7 @@ public class OaSrmVendorReapplyAction extends BaseBean implements Action, EsbSer // 当前明细表的所有数据,按行存储 Row[] sq = dtq.getRow(); int dtcount = 0; - String sql = "select distinct wlh from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename2 + " b where a.form_data_id=b.form_data_id and a.id=" + requestid; + String sql = "select distinct wlh from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename2 + " b where a.form_data_id=b.form_data_id and a.FORM_DATA_ID = " + dataid; logger_a5e612ac.error("sql-->" + sql); String poolname_uh = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 73abe51..a4025d8 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 @@ -61,6 +61,7 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer RequestInfo requestinfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); try { String requestid = requestinfo.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestid); String workflowid = requestinfo.getWorkflowid(); TransUtil tu = new TransUtil(); // String tablename = tu.getTableName(workflowid); @@ -159,7 +160,7 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer } int dtcount = 0; String detailTablename3 = commonDevUtil.getDetailTableName(tablename,"3"); - String sql = "select b.* from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename3 + " b where a.form_data_id=b.form_data_id and a.id=" + requestid; + String sql = "select b.* from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename3 + " b where a.form_data_id=b.form_data_id and a.FORM_DATA_ID = " + dataid; logger_41a64316.error(String.valueOf("sql-->" + sql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -242,7 +243,7 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer if(dtq != null){sq = dtq.getRow();} int dtcount = 0; String detailTablename = commonDevUtil.getDetailTableName(tablename,"2"); - String sql = "select distinct wlh from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename + " b where a.form_data_id=b.form_data_id and a.id =" + requestid; + String sql = "select distinct wlh from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename + " b where a.form_data_id=b.form_data_id and a.FORM_DATA_ID = " + dataid; logger_41a64316.error("sql-->" + sql); String poolname_wk = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 c227c9e..f9db27d 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 @@ -6,6 +6,7 @@ import com.weaver.seconddev.interfaces.eipoa.AccountService; import com.weaver.seconddev.interfaces.eipoa.SI_HTPortalUAMGMT2_OUTServiceStub; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -30,7 +31,8 @@ public class OperateAccountAction extends BaseBean implements Action, EsbServerl // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private CommonDevUtil commonDevUtil; @Autowired private AccountService service; private static final Logger logger_9c33175e = LoggerFactory.getLogger(OperateAccountAction.class); @@ -46,6 +48,7 @@ public class OperateAccountAction extends BaseBean implements Action, EsbServerl RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); try { String requestId = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestId); String wfid = request.getWorkflowid(); BillFieldUtil util = new BillFieldUtil(); // String tablename = util.getTablename(wfid); @@ -82,7 +85,7 @@ public class OperateAccountAction extends BaseBean implements Action, EsbServerl } } String sta = ""; - String getStatus = "select id ,status sta from e10_core_business.dbo." + tablename + " where id='" + requestId+"'"; + String getStatus = "select id ,status sta from e10_core_business.dbo." + tablename + " where FORM_DATA_ID = " + dataid; logger_9c33175e.error("getStatus--" + getStatus); String poolname_2x = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -122,7 +125,7 @@ public class OperateAccountAction extends BaseBean implements Action, EsbServerl logger_9c33175e.error(String.valueOf(requestId + "----" + gh + str + "成功")); } } - String sql = "update e10_core_business.dbo." + tablename + " set status='" + stat + "',message='" + message + "' where id=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set status='" + stat + "',message='" + message + "' where FORM_DATA_ID = " + dataid; logger_9c33175e.error("sql--" + sql); String poolname_y8 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -137,7 +140,7 @@ public class OperateAccountAction extends BaseBean implements Action, EsbServerl } catch (Exception e) { stat = "E"; message = e.toString(); - String errorLog = "update e10_core_business.dbo." + tablename + " set status='" + stat + "',message='" + message + "' where id=" + requestId; + String errorLog = "update e10_core_business.dbo." + tablename + " set status='" + stat + "',message='" + message + "' where FORM_DATA_ID = " + dataid; logger_9c33175e.error("errorLog--" + errorLog); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 469c494..88c481f 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 @@ -7,6 +7,7 @@ import java.util.Date; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.weaver.seconddev.interfaces.prop.ConfigProp; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import tebie.applib.api.APIContext; import tebie.applib.api.IClient; import com.weaver.seconddev.interfaces.eipoa.AccountService; @@ -55,7 +56,8 @@ public class OperateEmailAccountAction extends BaseBean implements Action, EsbSe // } // // } - + @Autowired + private CommonDevUtil commonDevUtil; @Autowired private AccountService service; private static final Logger logger_7c6670cc = LoggerFactory.getLogger(OperateEmailAccountAction.class); @@ -71,6 +73,7 @@ public class OperateEmailAccountAction extends BaseBean implements Action, EsbSe RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); try { String requestId = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestId); String wfid = request.getWorkflowid(); BillFieldUtil bill = new BillFieldUtil(); // String tablename = bill.getTablename(wfid); @@ -185,7 +188,7 @@ public class OperateEmailAccountAction extends BaseBean implements Action, EsbSe logger_7c6670cc.error(String.valueOf(requestId + "--" + res[0] + "--" + res[1])); } } - sql = "update e10_core_business.dbo." + tablename + " set status='" + res[0] + "',message='" + res[1] + "' where id=" + requestId; + sql = "update e10_core_business.dbo." + tablename + " set status='" + res[0] + "',message='" + res[1] + "' where FORM_DATA_ID = " + dataid; logger_7c6670cc.error("sql--" + sql); String poolname_46 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -197,7 +200,7 @@ public class OperateEmailAccountAction extends BaseBean implements Action, EsbSe return WeaResult.fail(500, "执行异常:" + res[1]); } } catch (Exception e) { - sql = "update e10_core_business.dbo." + tablename + " set status='E',message='" + e.toString() + "' where id =" + requestId; + sql = "update e10_core_business.dbo." + tablename + " set status='E',message='" + e.toString() + "' where FORM_DATA_ID = " + dataid; logger_7c6670cc.error("sql--" + sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 30c33ad..e10b9bd 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 @@ -6,6 +6,7 @@ import com.weaver.seconddev.interfaces.eipoa.MesAccountService; import com.weaver.seconddev.interfaces.eipoa.SI_HTPortalFuncSync_OUTServiceStub.UserSyncInfo; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -30,6 +31,8 @@ public class OperateMesAccountAction extends BaseBean implements Action, EsbServ // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; + @Autowired + private CommonDevUtil commonDevUtil; @Autowired @@ -48,6 +51,7 @@ public class OperateMesAccountAction extends BaseBean implements Action, EsbServ RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); try { String requestId = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestId); String wfid = request.getWorkflowid(); BillFieldUtil util = new BillFieldUtil(); // String tablename = util.getTablename(wfid); @@ -84,7 +88,7 @@ public class OperateMesAccountAction extends BaseBean implements Action, EsbServ } } String sta = ""; - String getStatus = "select id,status from e10_core_business.dbo." + tablename + " where id=" + requestId; + String getStatus = "select id,status from e10_core_business.dbo." + tablename + " where FORM_DATA_ID = " + dataid; logger_4057422d.error("getStatus" + getStatus); String poolname_me = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -121,7 +125,7 @@ public class OperateMesAccountAction extends BaseBean implements Action, EsbServ logger_4057422d.error(String.valueOf(requestId + "----" + gh + str + "成功")); } } - String sql = "update e10_core_business.dbo." + tablename + " set status='" + stat + "',message='" + message + "' where id=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set status='" + stat + "',message='" + message + "' where FORM_DATA_ID = " + dataid; logger_4057422d.error("sql" + sql); String poolname_cc = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -131,7 +135,7 @@ public class OperateMesAccountAction extends BaseBean implements Action, EsbServ } catch (Exception e) { stat = "E"; message = e.toString(); - String errorLog = "update e10_core_business.dbo." + tablename + " set status='" + stat + "',message='" + message + "' where id=" + requestId; + String errorLog = "update e10_core_business.dbo." + tablename + " set status='" + stat + "',message='" + message + "' where FORM_DATA_ID = " + dataid; logger_4057422d.error("errorLog" + errorLog); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 e246ade..7168325 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 @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -30,7 +31,8 @@ public class SY_WLPS_NEW_RETURNAction extends BaseBean implements Action, EsbSer // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private CommonDevUtil commonDevUtil; @Autowired private ReturnMesWLPS_SYService service; private static final Logger logger_882eb0b2 = LoggerFactory.getLogger(SY_WLPS_NEW_RETURNAction.class); @@ -46,6 +48,7 @@ public class SY_WLPS_NEW_RETURNAction extends BaseBean implements Action, EsbSer RequestInfo requestinfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); try { String requestId = requestinfo.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestId); logger_882eb0b2.error(String.valueOf("SY_WLPS_NEW_RETURNAction--" + requestId + "开始执行")); // 工作流ID String workFlowId = requestinfo.getWorkflowid(); @@ -98,7 +101,7 @@ 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 e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where id=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where FORM_DATA_ID = " + dataid; String poolname_9c = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 boolean b = rs.executeSql(sql, poolname_9c); @@ -106,7 +109,7 @@ public class SY_WLPS_NEW_RETURNAction extends BaseBean implements Action, EsbSer return WeaResult.fail(500, "SY_WLPS_NEW_RETURNAction ret[1]"+ ret[1], getResultMapForAction(weaverResultMap, "result",ret[1], requestinfo.getRequestManager())); }else { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where id=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where FORM_DATA_ID = " + dataid; String poolname_9c = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 boolean b = rs.executeSql(sql, poolname_9c); @@ -116,7 +119,7 @@ public class SY_WLPS_NEW_RETURNAction extends BaseBean implements Action, EsbSer } catch (Exception exception) { logger_882eb0b2.error(String.valueOf("SY_WLPS_NEW_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 id=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set state='E',message='" + exception.getMessage() + "' where FORM_DATA_ID = " + dataid; logger_882eb0b2.error("sql--" + sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 9ac6395..7fbc1d4 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 @@ -13,6 +13,7 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -40,6 +41,9 @@ public class SY_WLPS_RETURNAction extends BaseBean implements Action, EsbServerl private RequestInfo requestInfoTemp; @Autowired private ReturnMesWLPS_SYService service; + @Autowired + private CommonDevUtil commonDevUtil; + private static final Logger logger_1852f2d3 = LoggerFactory.getLogger(SY_WLPS_RETURNAction.class); public SY_WLPS_RETURNAction() { @@ -53,6 +57,7 @@ public class SY_WLPS_RETURNAction extends BaseBean implements Action, EsbServerl RequestInfo requestinfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); try { String requestId = requestinfo.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestId); logger_1852f2d3.error(String.valueOf("SY_WLPS_RETURNAction--" + requestId + "开始执行")); // 工作流ID String workFlowId = requestinfo.getWorkflowid(); @@ -95,7 +100,7 @@ public class SY_WLPS_RETURNAction extends BaseBean implements Action, EsbServerl logger_1852f2d3.error(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 e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where id=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where FORM_DATA_ID = " + dataid; logger_1852f2d3.error("sql--" + sql); String poolname_ki = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -108,7 +113,7 @@ public class SY_WLPS_RETURNAction extends BaseBean implements Action, EsbServerl } catch (Exception exception) { logger_1852f2d3.error(String.valueOf("SY_WLPS_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 id=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set state='E',message='" + exception.getMessage() + "' where FORM_DATA_ID = " + dataid; logger_1852f2d3.error("sql--" + sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 189095e..6e8e231 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 @@ -13,6 +13,7 @@ import com.weaver.seconddev.interfaces.oames.SI_OA_HTOAApproFlowSync_OUTService import com.weaver.seconddev.interfaces.oames.SI_OA_HTOAApproFlowSync_OUTServiceStub.WLPS_SY_Request; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -38,7 +39,8 @@ public class SY_WLPS_RETURNNewAction extends BaseBean implements Action, EsbServ // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private CommonDevUtil commonDevUtil; @Autowired private ReturnMesWLPS_SYService service; private static final Logger logger_4dd7c639 = LoggerFactory.getLogger(SY_WLPS_RETURNNewAction.class); @@ -53,6 +55,7 @@ public class SY_WLPS_RETURNNewAction extends BaseBean implements Action, EsbServ RequestInfo requestinfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); try { String requestId = requestinfo.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestId); logger_4dd7c639.error(String.valueOf("SY_WLPS_RETURNAction--" + requestId + "开始执行")); // 工作流ID String workFlowId = requestinfo.getWorkflowid(); @@ -92,7 +95,7 @@ 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 e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where id=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where FORM_DATA_ID = " + dataid; logger_4dd7c639.error("sql--" + sql); String poolname_2y = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -101,7 +104,7 @@ public class SY_WLPS_RETURNNewAction extends BaseBean implements Action, EsbServ return WeaResult.fail(500, "SY_WLPS_RETURNNewAction ret[0]"+ret[0], getResultMapForAction(weaverResultMap, "result",ret[0], requestinfo.getRequestManager())); }else if ("S".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 id=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where FORM_DATA_ID = " + dataid; logger_4dd7c639.error("sql--" + sql); String poolname_2y = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -113,7 +116,7 @@ public class SY_WLPS_RETURNNewAction extends BaseBean implements Action, EsbServ } catch (Exception exception) { logger_4dd7c639.error(String.valueOf("SY_WLPS_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 id=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set state='E',message='" + exception.getMessage() + "' where FORM_DATA_ID = " + dataid; logger_4dd7c639.error("sql--" + sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 1f32939..61b9de8 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 @@ -56,6 +56,7 @@ public class TransferBillToK3Action extends BaseBean implements Action, EsbServe RequestInfo requestinfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); try { String requestid = requestinfo.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestid); String workflowid = requestinfo.getWorkflowid(); String message = ""; RecordSet rs = I18nContextUtil.getBean(RecordSet.class); @@ -154,7 +155,7 @@ public class TransferBillToK3Action extends BaseBean implements Action, EsbServe return WeaResult.fail(500, "TransferBillToK3Action str[1]"+ str[1], getResultMapForAction(weaverResultMap, "result", str[1], requestinfo.getRequestManager())); } if (str[3].length() > 0) { - sql = "update e10_core_business.dbo." + detailTablename + " 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 + ")"; + sql = "update e10_core_business.dbo." + detailTablename + " set tbzt=1 where ckbm in (" + str[3].substring(0, str[3].length() - 1) + ") and form_data_id =" + dataid; logger_1a36f94a.error("sql--"+sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -163,7 +164,7 @@ public class TransferBillToK3Action extends BaseBean implements Action, EsbServe logger_1a36f94a.error(String.valueOf(requestid + "调拨单成功的：" + sql)); } if (str[2].length() > 0) { - sql = "update e10_core_business.dbo." + detailTablename + " 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 + ")"; + sql = "update e10_core_business.dbo." + detailTablename + " set tbzt=0 where ckbm in (" + str[2].substring(0, str[2].length() - 1) + ") and form_data_id =" + dataid; logger_1a36f94a.error("sql--"+sql); String poolname_ji = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -172,7 +173,7 @@ public class TransferBillToK3Action extends BaseBean implements Action, EsbServe logger_1a36f94a.error(String.valueOf(requestid + "调拨单失败的：" + sql)); } if (str[2].length() == 0 && str[3].length() == 0) { - sql = "update e10_core_business.dbo." + detailTablename + " 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 + ")"; + sql = "update e10_core_business.dbo." + detailTablename + " set tbzt=0 where (tbzt is null or tbzt !=1) and form_data_id =" + dataid; logger_1a36f94a.error("sql--"+sql); String poolname_19 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -190,7 +191,7 @@ public class TransferBillToK3Action extends BaseBean implements Action, EsbServe } String poolname_sn = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - boolean b = rs.executeSql("update e10_core_business.dbo." + tablename + " set message=isnull(message,'')+'" + message + "' where id =" + requestid, poolname_sn); + boolean b = rs.executeSql("update e10_core_business.dbo." + tablename + " set message=isnull(message,'')+'" + message + "' where FORM_DATA_ID = " + dataid, poolname_sn); logger_1a36f94a.error(String.valueOf(requestid + "调拨单消息：" + 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/UpdateFwInfoAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateFwInfoAction.java index 2d3d011..fb2d215 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 @@ -3,6 +3,7 @@ package com.weaver.seconddev.interfaces.workflow.action; import java.util.HashMap; import java.util.Map; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -26,6 +27,8 @@ public class UpdateFwInfoAction extends BaseBean implements Action, EsbServerles // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; + @Autowired + private CommonDevUtil commonDevUtil; private static final Logger logger_af68f31d = LoggerFactory.getLogger(UpdateFwInfoAction.class); @@ -42,6 +45,8 @@ public class UpdateFwInfoAction extends BaseBean implements Action, EsbServerles // 默认信息 String message = "操作成功"; String requestid = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestid); + Map map = new HashMap(); // 表单名称 String tablename = request.getRequestManager().getBillTableName(); @@ -78,7 +83,7 @@ public class UpdateFwInfoAction extends BaseBean implements Action, EsbServerles return WeaResult.fail(500, "UpdateFwInfoAction err"+ e, getResultMapForAction(weaverResultMap, "result",e.getMessage(), request.getRequestManager())); } finally { // 重构成功后 更新状态 - 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(); + String sql2 = (new StringBuilder()).append("update e10_core_business.dbo.").append(tablename).append(" set sta ='").append(state).append("', meg = '").append(message).append("' where FORM_DATA_ID = ").append(dataid).toString(); logger_af68f31d.error(String.valueOf((new StringBuilder()).append("UpdateFwInfoAction 更新状态 logsql:").append(sql2).toString())); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 90f27b0..f3a636e 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 @@ -7,6 +7,7 @@ import java.math.*; import com.weaver.seconddev.interfaces.swfa.*; import com.weaver.seconddev.interfaces.swfa.sl.*; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import com.weaver.verupgrade.workflow.request.RequestManager; @@ -40,7 +41,8 @@ public class ZOA_CCSQ_AQJB_Action extends BaseBean implements Action, EsbServerl // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private CommonDevUtil commonDevUtil; private static final Logger logger_31bb84de = LoggerFactory.getLogger(ZOA_CCSQ_AQJB_Action.class); public WeaResult> execute(Map requestInfoMap) { @@ -55,6 +57,8 @@ public class ZOA_CCSQ_AQJB_Action extends BaseBean implements Action, EsbServerl String aqjb = "90"; // 流程请求ID String reid = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(reid); + // 出差随行人员 String ccsxry = ""; logger_31bb84de.error(String.valueOf("ZOA_CCSQ_AQJB_Action-Request: " + reid + "开始")); @@ -91,7 +95,7 @@ public class ZOA_CCSQ_AQJB_Action extends BaseBean implements Action, EsbServerl sqr = "0"; } if (!tablename.equals("")) { - logsql = "update e10_core_business.dbo." + tablename + " set aqjb = (select max(sec_level) from eteams.dbo.employee as HrmResource where id in (" + sqr + ") or id in (" + ccsxry + ") ) where id = " + reid; + logsql = "update e10_core_business.dbo." + tablename + " set aqjb = (select max(sec_level) from eteams.dbo.employee as HrmResource where id in (" + sqr + ") or id in (" + ccsxry + ") ) where FORM_DATA_ID = " + dataid; logger_31bb84de.error(String.valueOf("logsql:" + logsql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 cd15386..92b8834 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 @@ -11,6 +11,7 @@ import com.sap.conn.jco.JCoDestination; import com.sap.conn.jco.JCoFunction; import com.sap.conn.jco.JCoStructure; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -37,7 +38,8 @@ public class ZOA_FICO_ANLA_CHANGEAction extends BaseBean implements Action, EsbS // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private CommonDevUtil commonDevUtil; private static final Logger logger_14793b45 = LoggerFactory.getLogger(ZOA_FICO_ANLA_CHANGEAction.class); public ZOA_FICO_ANLA_CHANGEAction() { @@ -69,7 +71,8 @@ public class ZOA_FICO_ANLA_CHANGEAction extends BaseBean implements Action, EsbS String e_istat = String.valueOf(returnStr[0]); String e_message = String.valueOf(returnStr[1]); if ("S".equals(e_istat)) { - String sql = "update e10_core_business.dbo." + tablename + " set sta ='" + e_istat + "', meg = '" + e_message + "' where id = " + requestId; + String dataid = commonDevUtil.getidByrequestid(requestId); + String sql = "update e10_core_business.dbo." + tablename + " set sta ='" + e_istat + "', meg = '" + e_message + "' where FORM_DATA_ID = " + dataid; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 boolean b = rs.executeSql(sql, poolname); 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 81c231b..46f59a3 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 @@ -11,6 +11,7 @@ import com.sap.conn.jco.JCoDestination; import com.sap.conn.jco.JCoFunction; import com.sap.conn.jco.JCoStructure; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -44,6 +45,9 @@ public class ZOA_FICO_COC_CREATIONAction extends BaseBean implements Action, Esb @Autowired private ZOA_FICO_COC_CHANGE zoaFicoCocChange; + @Autowired + private CommonDevUtil commonDevUtil; + private static final Logger logger_8236b79b = LoggerFactory.getLogger(ZOA_FICO_COC_CREATIONAction.class); public ZOA_FICO_COC_CREATIONAction() { @@ -58,6 +62,8 @@ public class ZOA_FICO_COC_CREATIONAction extends BaseBean implements Action, Esb try { try { String requestId = requestinfo.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestId); + String tablename = requestinfo.getRequestManager().getBillTableName(); Map map = new HashMap(); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); @@ -82,7 +88,7 @@ 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 e10_core_business.dbo." + tablename + " set sta ='" + e_istat + "', meg = '" + e_message + "' where id = " + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set sta ='" + e_istat + "', meg = '" + e_message + "' where FORM_DATA_ID = " + dataid; logger_8236b79b.error("sql--" + sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 6ed2e8d..e804e9f 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 @@ -3,6 +3,7 @@ package com.weaver.seconddev.interfaces.workflow.action; import java.text.SimpleDateFormat; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -31,7 +32,8 @@ public class ZOA_FI_CUSTOMER_MAINTAINAction extends BaseBean implements Action, // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private CommonDevUtil commonDevUtil; private static final Logger logger_30bd33f8 = LoggerFactory.getLogger(ZOA_FI_CUSTOMER_MAINTAINAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -43,6 +45,7 @@ public class ZOA_FI_CUSTOMER_MAINTAINAction extends BaseBean implements Action, try { // 流程请求ID String reid = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(reid); RecordSet rs1 = I18nContextUtil.getBean(RecordSet.class); BillFieldUtil unit = new BillFieldUtil(); try { @@ -218,10 +221,10 @@ 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 id = " + reid; + logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + output + "' where FORM_DATA_ID = " + dataid; logger_30bd33f8.error(String.valueOf("start log--" + edit_flag + "--" + reid)); } else { - logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', khdm = '" + kunnr + "', meg = '" + output + "' where id = " + reid; + logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', khdm = '" + kunnr + "', meg = '" + output + "' where FORM_DATA_ID = " + dataid; logger_30bd33f8.error(String.valueOf("start log--" + edit_flag + "--" + reid)); } String poolname = CONN_TYPE.workflow.getType(); 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 2617465..e21b6e6 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 @@ -4,6 +4,7 @@ import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import java.util.HashMap; import java.util.Map; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -26,6 +27,8 @@ public class ZOA_FI_IORD_RFC_Action extends BaseBean implements Action, EsbServe // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; + @Autowired + private CommonDevUtil commonDevUtil; private static final Logger logger_a0e600a3 = LoggerFactory.getLogger(ZOA_FI_IORD_RFC_Action.class); @@ -38,6 +41,7 @@ public class ZOA_FI_IORD_RFC_Action extends BaseBean implements Action, EsbServe RequestInfo requestinfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); try { String requestid = requestinfo.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestid); try { logger_a0e600a3.error(String.valueOf("ZOA_FI_IORD_RFC_Action--start--" + requestid)); String workflowid = requestinfo.getWorkflowid(); @@ -88,7 +92,7 @@ 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 id=" + requestid; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0][0] + "',message='" + ret[0][1] + "',nbddh=isnull('" + ret[0][2] + "','') where FORM_DATA_ID = " + dataid; logger_a0e600a3.error(String.valueOf("ZOA_FI_IORD_RFC_Action--sql--" + sql + "-" + requestid)); boolean b = rs.executeSql(sql, poolname); logger_a0e600a3.error(String.valueOf("ZOA_FI_IORD_RFC_Action--b--" + b + "-" + requestid)); 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 d569440..b8c9375 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 @@ -3,6 +3,7 @@ package com.weaver.seconddev.interfaces.workflow.action; import java.text.SimpleDateFormat; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -31,7 +32,8 @@ public class ZOA_FI_VENDOR_MAINTAIN_GYSAction extends BaseBean implements Action // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private CommonDevUtil commonDevUtil; private static final Logger logger_2da6de30 = LoggerFactory.getLogger(ZOA_FI_VENDOR_MAINTAIN_GYSAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -215,6 +217,7 @@ public class ZOA_FI_VENDOR_MAINTAIN_GYSAction extends BaseBean implements Action prdetail[0] = edit_flag; String tablename = ""; String wfid = request.getWorkflowid(); + String dataid = commonDevUtil.getidByrequestid(wfid); // tablename = unit.getTablename(wfid); tablename = request.getRequestManager().getBillTableName(); ZOA_FI_VENDOR_MAINTAIN po = new ZOA_FI_VENDOR_MAINTAIN(); @@ -231,9 +234,9 @@ public class ZOA_FI_VENDOR_MAINTAIN_GYSAction extends BaseBean implements Action String output = "----" + date + "," + time + "," + meg; String logsql = ""; if (lifnr.equals("")) { - logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + output + "' where id = " + reid; + logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + output + "' where FORM_DATA_ID = " + dataid; } else { - logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', gysdm = '" + lifnr + "', meg = '" + output + "' where id = " + reid; + logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', gysdm = '" + lifnr + "', meg = '" + output + "' where FORM_DATA_ID = " + dataid; } logger_2da6de30.error(String.valueOf("start logsql--" + logsql + "--" + reid)); String poolname = CONN_TYPE.workflow.getType(); 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 78556e9..40f48e4 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 @@ -10,6 +10,7 @@ import java.math.*; import com.weaver.seconddev.interfaces.htjt.util.TransUtil; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import com.weaver.verupgrade.workflow.request.RequestManager; @@ -43,7 +44,8 @@ public class ZOA_MM_PR_CREATE_BpAction extends BaseBean implements Action, EsbSe // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private CommonDevUtil commonDevUtil; private static final Logger logger_8cb80c57 = LoggerFactory.getLogger(ZOA_MM_PR_CREATE_BpAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -59,6 +61,7 @@ public class ZOA_MM_PR_CREATE_BpAction extends BaseBean implements Action, EsbSe BaseBean log = new BaseBean(); // 流程请求ID String reid = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(reid); SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String nowTime = sdft.format(new Date()); try { @@ -167,7 +170,7 @@ public class ZOA_MM_PR_CREATE_BpAction 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 id = " + reid; + String logsql = "update e10_core_business.dbo." + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where FORM_DATA_ID = " + dataid; logger_8cb80c57.error(String.valueOf(nowTime + " " + reid + "logsql:" + logsql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 e9deb5c..d160da2 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 @@ -10,6 +10,7 @@ import java.math.*; import com.weaver.seconddev.interfaces.htjt.util.TransUtil; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import com.weaver.verupgrade.workflow.request.RequestManager; @@ -44,6 +45,8 @@ public class ZOA_MM_PR_CREATE_FYH_BgAction extends BaseBean implements Action, E @Autowired private RequestInfo requestInfoTemp; + @Autowired + private CommonDevUtil commonDevUtil; private static final Logger logger_371c14b8 = LoggerFactory.getLogger(ZOA_MM_PR_CREATE_FYH_BgAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -76,6 +79,7 @@ public class ZOA_MM_PR_CREATE_FYH_BgAction extends BaseBean implements Action, E int xmh = 0; // 流程请求ID String reid = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(reid); // spr = hr.getResourcename(request.getLastoperator());//获取审批人姓名 // 获取表单主字段信息 Property[] properties = request.getMainTableInfo().getProperty(); @@ -178,7 +182,7 @@ 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 e10_core_business.dbo." + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where id = " + reid; + String logsql = "update e10_core_business.dbo." + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where FORM_DATA_ID = " + dataid; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 boolean b = rs1.executeSql(logsql, poolname); 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 92d4a01..957caf9 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 @@ -4,6 +4,7 @@ import com.weaver.seconddev.interfaces.htjt.util.TransUtil; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import java.text.SimpleDateFormat; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -38,6 +39,8 @@ public class ZOA_MM_PR_CREATE_FYH_FyAction extends BaseBean implements Action, E @Autowired private RequestInfo requestInfoTemp; + @Autowired + private CommonDevUtil commonDevUtil; private static final Logger logger_8ed0f2c6 = LoggerFactory.getLogger(ZOA_MM_PR_CREATE_FYH_FyAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -70,6 +73,7 @@ public class ZOA_MM_PR_CREATE_FYH_FyAction extends BaseBean implements Action, E int xmh = 0; // 流程请求ID String reid = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(reid); // spr = hr.getResourcename(request.getLastoperator());//获取审批人姓名 // 获取表单主字段信息 Property[] properties = request.getMainTableInfo().getProperty(); @@ -164,7 +168,7 @@ public class ZOA_MM_PR_CREATE_FYH_FyAction extends BaseBean implements Action, E 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 id = " + reid; + String logsql = "update e10_core_business.dbo." + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where FORM_DATA_ID = " + dataid; logger_8ed0f2c6.error(String.valueOf("ZOA_MM_PR_CREATE_FYH_FyAction:" + logsql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 c085af1..8c99b24 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 @@ -4,6 +4,7 @@ import java.util.*; import java.text.*; import java.math.*; import com.weaver.seconddev.interfaces.htjt.util.TransUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import org.apache.commons.lang.StringEscapeUtils; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import com.weaver.common.i18n.tool.util.I18nContextUtil; @@ -40,7 +41,8 @@ public class ZOA_MM_PR_CREATE_GDZC_ZcAction extends BaseBean implements Action, // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private CommonDevUtil commonDevUtil; private static final Logger logger_a58ea05 = LoggerFactory.getLogger(ZOA_MM_PR_CREATE_GDZC_ZcAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -73,6 +75,8 @@ public class ZOA_MM_PR_CREATE_GDZC_ZcAction extends BaseBean implements Action, int xmh = 0; // 流程请求ID String reid = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(reid); + // spr = hr.getResourcename(request.getLastoperator());//获取审批人姓名 // 获取表单主字段信息 Property[] properties = request.getMainTableInfo().getProperty(); @@ -176,7 +180,7 @@ 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 id = " + reid; + String logsql = "update e10_core_business.dbo." + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where FORM_DATA_ID = " + dataid; logger_a58ea05.error("logsql--" + logsql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 6cd568e..c544914 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 @@ -4,6 +4,7 @@ import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import java.text.SimpleDateFormat; import java.util.HashMap; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -35,7 +36,8 @@ public class ZOA_MM_PR_CREATE_JGJ_JgAction extends BaseBean implements Action, E // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private CommonDevUtil commonDevUtil; private static final Logger logger_56a61d8 = LoggerFactory.getLogger(ZOA_MM_PR_CREATE_JGJ_JgAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -65,6 +67,7 @@ public class ZOA_MM_PR_CREATE_JGJ_JgAction extends BaseBean implements Action, E String[][] prdetail = null; // 流程请求ID String reid = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(reid); // 接单意见 0 全部同意接单 1 非全部同意接单 2 不满足退回 3 线缆接单 4 智能接单 String jdyj = ""; // 获取表单主字段信息 @@ -290,7 +293,7 @@ public class ZOA_MM_PR_CREATE_JGJ_JgAction extends BaseBean implements Action, E String date = datetype.format(now); String time = timetype.format(now); String output = date + "," + time + "," + meg; - String logsql = "update e10_core_business.dbo." + tablename + " set cgsqh ='" + cgsqh + "', state = '" + sta + "', message = '" + output + "' where id = " + reid; + String logsql = "update e10_core_business.dbo." + tablename + " set cgsqh ='" + cgsqh + "', state = '" + sta + "', message = '" + output + "' where FORM_DATA_ID = " + dataid; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 boolean b = rs1.executeSql(logsql, poolname); 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 58095b8..f388be7 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 @@ -10,6 +10,7 @@ import java.math.*; import com.weaver.seconddev.interfaces.htjt.util.TransUtil; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import com.weaver.verupgrade.workflow.request.RequestManager; @@ -44,6 +45,8 @@ public class ZOA_MM_PR_CREATE_LbAction extends BaseBean implements Action, EsbSe @Autowired private RequestInfo requestInfoTemp; + @Autowired + private CommonDevUtil commonDevUtil; private static final Logger logger_b6ec8f7f = LoggerFactory.getLogger(ZOA_MM_PR_CREATE_LbAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -74,6 +77,7 @@ public class ZOA_MM_PR_CREATE_LbAction extends BaseBean implements Action, EsbSe int xmh = 0; // 流程请求ID String reid = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(reid); // spr = hr.getResourcename(request.getLastoperator());//获取审批人姓名 // 获取表单主字段信息 Property[] properties = request.getMainTableInfo().getProperty(); @@ -162,7 +166,7 @@ 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 id = " + reid; + String logsql = "update e10_core_business.dbo." + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where FORM_DATA_ID = " + dataid; logger_b6ec8f7f.error(String.valueOf("start logsql--" + logsql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 9bc8023..80f6721 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 @@ -3,6 +3,7 @@ package com.weaver.seconddev.interfaces.workflow.action; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import java.text.SimpleDateFormat; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -37,6 +38,9 @@ public class ZOA_MM_PR_CREATE_SCXAction extends BaseBean implements Action, EsbS @Autowired private RequestInfo requestInfoTemp; + @Autowired + private CommonDevUtil commonDevUtil; + private static final Logger logger_25ffe2ab = LoggerFactory.getLogger(ZOA_MM_PR_CREATE_SCXAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -64,6 +68,7 @@ public class ZOA_MM_PR_CREATE_SCXAction extends BaseBean implements Action, EsbS int xmh = 0; // 流程请求ID String reid = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(reid); // spr = hr.getResourcename(request.getLastoperator());//获取审批人姓名 // 获取表单主字段信息 Property[] properties = request.getMainTableInfo().getProperty(); @@ -165,7 +170,7 @@ public class ZOA_MM_PR_CREATE_SCXAction extends BaseBean implements Action, EsbS 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 id = " + reid; + String logsql = "update e10_core_business.dbo." + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where FORM_DATA_ID = " + dataid; logger_25ffe2ab.error("logsql--" + logsql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 a8570ab..af9e8d4 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 @@ -3,6 +3,7 @@ package com.weaver.seconddev.interfaces.workflow.action; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import java.text.SimpleDateFormat; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -36,7 +37,8 @@ public class ZOA_MM_PR_CREATE_WWJGAction extends BaseBean implements Action, Esb // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private CommonDevUtil commonDevUtil; private static final Logger logger_54a06806 = LoggerFactory.getLogger(ZOA_MM_PR_CREATE_WWJGAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -64,6 +66,7 @@ public class ZOA_MM_PR_CREATE_WWJGAction extends BaseBean implements Action, Esb int xmh = 0; // 流程请求ID String reid = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(reid); // spr = hr.getResourcename(request.getLastoperator());//获取审批人姓名 // 获取表单主字段信息 Property[] properties = request.getMainTableInfo().getProperty(); @@ -155,7 +158,7 @@ public class ZOA_MM_PR_CREATE_WWJGAction extends BaseBean implements Action, Esb 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 id = " + reid; + String logsql = "update e10_core_business.dbo." + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where FORM_DATA_ID = " + dataid; logger_54a06806.error("logsql--" + logsql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 796a102..105e5c1 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 @@ -3,6 +3,7 @@ package com.weaver.seconddev.interfaces.workflow.action; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import java.text.SimpleDateFormat; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -32,7 +33,8 @@ public class ZOA_MM_PR_CREATE_YFAction extends BaseBean implements Action, EsbSe // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private CommonDevUtil commonDevUtil; private static final Logger logger_342d5bb6 = LoggerFactory.getLogger(ZOA_MM_PR_CREATE_YFAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -60,6 +62,7 @@ public class ZOA_MM_PR_CREATE_YFAction extends BaseBean implements Action, EsbSe int xmh = 0; // 流程请求ID String reid = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(reid); // 获取表单主字段信息 Property[] properties = request.getMainTableInfo().getProperty(); for (int i = 0; i < properties.length; i++) { @@ -157,7 +160,7 @@ public class ZOA_MM_PR_CREATE_YFAction 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 id = " + reid; + String logsql = "update e10_core_business.dbo." + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where FORM_DATA_ID = " + dataid; logger_342d5bb6.error("logsql" + logsql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 555e05d..6642a50 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 @@ -14,6 +14,7 @@ import com.weaver.seconddev.interfaces.htjt.util.TransUtil; import com.weaver.seconddev.interfaces.prop.ConfigProp; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import org.springframework.core.env.Environment; @@ -53,6 +54,9 @@ public class ZOA_MM_PR_CREATE_YFFY_ZjAction extends BaseBean implements Action, private RequestInfo requestInfoTemp; @Autowired private LogUtil logUtil; + @Autowired + private CommonDevUtil commonDevUtil; + private static final Logger logger_adb00a32 = LoggerFactory.getLogger(ZOA_MM_PR_CREATE_YFFY_ZjAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -64,6 +68,8 @@ public class ZOA_MM_PR_CREATE_YFFY_ZjAction extends BaseBean implements Action, try { // 流程请求ID String reid = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(reid); + String workflowid = request.getWorkflowid(); String requestName = request.getRequestManager().getRequestname(); // LogUtil logUtil = new LogUtil(); @@ -199,7 +205,7 @@ public class ZOA_MM_PR_CREATE_YFFY_ZjAction 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 id = " + reid; + String logsql = "update e10_core_business.dbo." + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where FORM_DATA_ID = " + dataid; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 boolean b = rs1.executeSql(logsql, poolname); 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 038bd07..8db23ec 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 @@ -9,6 +9,7 @@ import java.text.*; import java.math.*; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import com.weaver.verupgrade.workflow.request.RequestManager; @@ -42,7 +43,8 @@ public class ZOA_MM_PR_CREATE_ZJGC_ZjAction extends BaseBean implements Action, // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private CommonDevUtil commonDevUtil; private static final Logger logger_518ea046 = LoggerFactory.getLogger(ZOA_MM_PR_CREATE_ZJGC_ZjAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -72,6 +74,7 @@ public class ZOA_MM_PR_CREATE_ZJGC_ZjAction extends BaseBean implements Action, int xmh = 0; // 流程请求ID String reid = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(reid); // spr = hr.getResourcename(request.getLastoperator());//获取审批人姓名 // 获取表单主字段信息 Property[] properties = request.getMainTableInfo().getProperty(); @@ -182,7 +185,7 @@ public class ZOA_MM_PR_CREATE_ZJGC_ZjAction 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 id = " + reid; + String logsql = "update e10_core_business.dbo." + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where FORM_DATA_ID = " + dataid; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 boolean b = rs1.executeSql(logsql, poolname); 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 9af171e..5c08def 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 @@ -144,7 +144,7 @@ public class ZOA_MM_PR_RELEASEAction extends BaseBean implements Action, EsbServ Object[] obj1 = new Object[2]; obj1[0] = e_status; obj1[1] = e_message; - String sql = "update " + tablename + " set status = ? , message = ? where id = " + requestId; + String sql = "update " + tablename + " set status = ? , message = ? where FORM_DATA_ID = " + dataid; logger_41a94d2d.error(String.valueOf("ZOA_MM_PR_RELEASEAction ----- sql = " + sql)); String poolname_sb = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_ZMMT002_FASTCONFIG_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_ZMMT002_FASTCONFIG_Action.java index 62156c0..06d790f 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_ZMMT002_FASTCONFIG_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_ZMMT002_FASTCONFIG_Action.java @@ -9,6 +9,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -34,6 +35,9 @@ public class ZOA_MM_ZMMT002_FASTCONFIG_Action extends BaseBean implements Action @Autowired private RequestInfo requestInfoTemp; + @Autowired + private CommonDevUtil commonDevUtil; + private static final Logger logger_e6726d63 = LoggerFactory.getLogger(ZOA_MM_ZMMT002_FASTCONFIG_Action.class); @Override @@ -45,6 +49,7 @@ public class ZOA_MM_ZMMT002_FASTCONFIG_Action extends BaseBean implements Action RequestInfo requestinfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); try { String requestid = requestinfo.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestid); String wfid = requestinfo.getWorkflowid(); logger_e6726d63.error(String.valueOf("ZOA_MM_ZMMT002_FASTCONFIG_Action-start:" + requestid)); BillFieldUtil util = new BillFieldUtil(); @@ -113,7 +118,7 @@ public class ZOA_MM_ZMMT002_FASTCONFIG_Action extends BaseBean implements Action 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='" + retstr[0] + "',message='" + retstr[1] + "' where id=" + requestid; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + retstr[0] + "',message='" + retstr[1] + "' where FORM_DATA_ID = " + dataid; logger_e6726d63.error("sql = " + sql ); boolean b1 = rs.executeSql(sql, poolname); logger_e6726d63.error("sql flag= " + b1 ); 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 22eee96..415b9fa 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 @@ -78,6 +78,8 @@ public class ZOA_SD_CREDIT_HANDLE_APPROVALAction extends BaseBean implements Act BillFieldUtil unit = new BillFieldUtil(); // 流程请求ID requestId = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestId); + logger_d591fda6.error(String.valueOf("ZOA_SD_CREDIT_HANDLE_APPROVALAction-Request: " + requestId + "开始")); // 获取表单主字段信息 Property[] properties = request.getMainTableInfo().getProperty(); @@ -130,7 +132,7 @@ 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 e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where id = " + requestId; + String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where FORM_DATA_ID = " + dataid; logger_d591fda6.error(String.valueOf("logsql:" + logsql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SD_CREDIT_HANDLE_QUERYAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SD_CREDIT_HANDLE_QUERYAction.java index b9dff5b..2ff7db8 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SD_CREDIT_HANDLE_QUERYAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SD_CREDIT_HANDLE_QUERYAction.java @@ -2,6 +2,7 @@ package com.weaver.seconddev.interfaces.workflow.action; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -30,7 +31,8 @@ public class ZOA_SD_CREDIT_HANDLE_QUERYAction extends BaseBean implements Action // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private CommonDevUtil commonDevUtil; private static final Logger logger_270bcd1 = LoggerFactory.getLogger(ZOA_SD_CREDIT_HANDLE_QUERYAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -58,6 +60,8 @@ public class ZOA_SD_CREDIT_HANDLE_QUERYAction extends BaseBean implements Action BillFieldUtil unit = new BillFieldUtil(); // 流程请求ID requestId = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestId); + logger_270bcd1.error(String.valueOf("ZOA_SD_CREDIT_HANDLE_QUERYAction-Request: " + requestId + "开始")); // 获取表单主字段信息 Property[] properties = request.getMainTableInfo().getProperty(); @@ -103,7 +107,7 @@ public class ZOA_SD_CREDIT_HANDLE_QUERYAction extends BaseBean implements Action String wfid = request.getWorkflowid(); // tablename = unit.getTablename(wfid); tablename = request.getRequestManager().getBillTableName(); - String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where id = " + requestId; + String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where FORM_DATA_ID = " + dataid; logger_270bcd1.error(String.valueOf("logsql:" + logsql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 d59ab28..0404d47 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 @@ -4,6 +4,8 @@ import java.util.*; import java.rmi.RemoteException; import java.text.*; import java.math.*; + +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import org.apache.axis2.AxisFault; import corp.openapicalls.contract.setapproval.request.PassengerDetail; import com.weaver.seconddev.interfaces.swfa.*; @@ -46,7 +48,8 @@ public class ZOA_SL_DP_Action extends BaseBean implements Action, EsbServerlessR @Autowired private OaCtrip oactrip; - + @Autowired + private CommonDevUtil commonDevUtil; private static final Logger logger_a5b8e7d5 = LoggerFactory.getLogger(ZOA_SL_DP_Action.class); public WeaResult> execute(Map requestInfoMap) { @@ -74,6 +77,7 @@ public class ZOA_SL_DP_Action extends BaseBean implements Action, EsbServerlessR String sqr = ""; // 流程请求ID String reid = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(reid); // 流程请求ID approvalnumber = reid; logger_a5b8e7d5.error(String.valueOf("ZOA_SL_DP_Action-Request: " + reid + "开始")); @@ -219,7 +223,7 @@ 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 e10_core_business.dbo." + tablename + " set status ='" + status + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where id = " + reid; + String logsql2 = "update e10_core_business.dbo." + tablename + " set status ='" + status + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where FORM_DATA_ID = " + dataid; logger_a5b8e7d5.error(String.valueOf("logsql2:" + logsql2)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 17ac637..da215a8 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 @@ -93,6 +93,7 @@ public class ZOA_SL_GNCC_Action extends BaseBean implements Action, EsbServerles try { // 流程请求ID String reid = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(reid); String requestname = request.getRequestManager().getRequestname(); String workflowid = request.getWorkflowid(); try { @@ -642,7 +643,7 @@ 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 e10_core_business.dbo." + tablename + " set status ='" + status + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where id = " + reid; + String logsql2 = "update e10_core_business.dbo." + tablename + " set status ='" + status + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where FORM_DATA_ID = " + dataid; logger_5e8d517a.error(String.valueOf("logsql2:" + logsql2)); String poolname_yg = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -721,7 +722,7 @@ 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 e10_core_business.dbo." + tablename + " set status ='" + dTtrip[0] + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where id = " + reid; + String logsql4 = "update e10_core_business.dbo." + tablename + " set status ='" + dTtrip[0] + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where FORM_DATA_ID = " + dataid; logger_5e8d517a.error(String.valueOf("logsql4:" + logsql4)); String poolname_m6 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 92ca42d..57a1afe 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 @@ -1,6 +1,7 @@ package com.weaver.seconddev.interfaces.workflow.action; import com.weaver.seconddev.interfaces.prop.ConfigProp; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import corp.openapicalls.contract.setapproval.request.PassengerDetail; import com.weaver.seconddev.interfaces.oactrip.OaCtrip; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; @@ -48,6 +49,9 @@ public class ZOA_SL_GN_Action extends BaseBean implements Action, EsbServerlessR @Autowired private CallDTtripService dTtripService; + @Autowired + private CommonDevUtil commonDevUtil; + // @Autowired // private CallSLServices callServices; private static final Logger logger_92c3db1a = LoggerFactory.getLogger(ZOA_SL_GN_Action.class); @@ -60,6 +64,7 @@ public class ZOA_SL_GN_Action extends BaseBean implements Action, EsbServerlessR try { // 流程请求ID String reid = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(reid); try { // 主体信息 String sourceType = ""; @@ -495,7 +500,7 @@ 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 e10_core_business.dbo." + tablename + " set status ='" + status + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where id = " + reid; + String logsql2 = "update e10_core_business.dbo." + tablename + " set status ='" + status + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where FORM_DATA_ID = " + dataid; logger_92c3db1a.error(String.valueOf("logsql2:" + logsql2)); String poolname_xv = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -572,7 +577,7 @@ 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 e10_core_business.dbo." + tablename + " set status ='" + dTtrip[0] + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where id = " + reid; + String logsql4 = "update e10_core_business.dbo." + tablename + " set status ='" + dTtrip[0] + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where FORM_DATA_ID = " + dataid; logger_92c3db1a.error(String.valueOf("logsql4:" + logsql4)); String poolname_65 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GWCC_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GWCC_Action.java index 3717383..1156a17 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GWCC_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GWCC_Action.java @@ -96,6 +96,7 @@ public class ZOA_SL_GWCC_Action extends BaseBean implements Action, EsbServerles try { // 流程请求ID String reid = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(reid); String requestname = request.getRequestManager().getRequestname(); String workflowid = request.getWorkflowid(); try { @@ -507,7 +508,7 @@ public class ZOA_SL_GWCC_Action extends BaseBean implements Action, EsbServerles String tenantKey = HrmContextUtil.getCurrentTenantKey(); logUtil.insertLog(tenantKey); str = Message; - String sql1 = "update e10_core_business.dbo." + tablename + " set message = isnull(cast(message as varchar(8000)),'') + '" + Message + "' where id = " + reid; + String sql1 = "update e10_core_business.dbo." + tablename + " set message = isnull(cast(message as varchar(8000)),'') + '" + Message + "' where FORM_DATA_ID = " + dataid; logger_f5224b91.error(String.valueOf("sql1:" + sql1)); String poolname = CONN_TYPE.workflow.getType(); @@ -661,7 +662,7 @@ public class ZOA_SL_GWCC_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 e10_core_business.dbo." + tablename + " set status ='" + status + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where id = " + reid; + String logsql2 = "update e10_core_business.dbo." + tablename + " set status ='" + status + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where FORM_DATA_ID = " + dataid; logger_f5224b91.error(String.valueOf("logsql2:" + logsql2)); String poolname_t9 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -738,7 +739,7 @@ public class ZOA_SL_GWCC_Action extends BaseBean implements Action, EsbServerles } message = "--同程接口回写说明--ReturnStatus:" + dTtrip[0] + "；ReturnMessage:" + dTtrip[1] + "；出差单号:" + dTtrip[2]; message = message.replace("'", "’"); - String logsql4 = "update e10_core_business.dbo." + tablename + " set status ='" + dTtrip[0] + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where id = " + reid; + String logsql4 = "update e10_core_business.dbo." + tablename + " set status ='" + dTtrip[0] + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where FORM_DATA_ID = " + dataid; logger_f5224b91.error(String.valueOf("logsql4:" + logsql4)); String poolname_ot = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 918dcb1..7cbff55 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 @@ -1,6 +1,7 @@ package com.weaver.seconddev.interfaces.workflow.action; import com.weaver.seconddev.interfaces.prop.ConfigProp; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import corp.openapicalls.contract.setapproval.request.PassengerDetail; import com.weaver.seconddev.interfaces.oactrip.OaCtrip; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; @@ -50,7 +51,8 @@ public class ZOA_SL_GW_Action extends BaseBean implements Action, EsbServerlessR private OaCtrip oactrip ; @Autowired private CallDTtripService dTtripService; - + @Autowired + private CommonDevUtil commonDevUtil; // @Autowired // private CallSLServices callServices; private static final Logger logger_39ae6ef1 = LoggerFactory.getLogger(ZOA_SL_GW_Action.class); @@ -63,6 +65,7 @@ public class ZOA_SL_GW_Action extends BaseBean implements Action, EsbServerlessR try { // 流程请求ID String reid = request.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(reid); try { // 主体信息 String sourceType = ""; @@ -511,7 +514,7 @@ 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 e10_core_business.dbo." + tablename + " set status ='" + status + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where id = " + reid; + String logsql2 = "update e10_core_business.dbo." + tablename + " set status ='" + status + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where FORM_DATA_ID = " + dataid; logger_39ae6ef1.error(String.valueOf("logsql2:" + logsql2)); String poolname_ym = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -585,7 +588,7 @@ public class ZOA_SL_GW_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 id = " + reid; + String logsql4 = "update " + tablename + " set status ='" + dTtrip[0] + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where FORM_DATA_ID = " + dataid; logger_39ae6ef1.error(String.valueOf("logsql4:" + logsql4)); String poolname_2f = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOEM_PRICE_DIFFERENCE_RATE_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOEM_PRICE_DIFFERENCE_RATE_Action.java index 31bc5ea..754a885 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOEM_PRICE_DIFFERENCE_RATE_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOEM_PRICE_DIFFERENCE_RATE_Action.java @@ -5,6 +5,7 @@ import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import java.util.HashMap; import java.util.Map; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import com.weaver.verupgrade.workflow.request.RequestManager; @@ -31,6 +32,9 @@ public class ZOEM_PRICE_DIFFERENCE_RATE_Action extends BaseBean implements Actio // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; + @Autowired + private CommonDevUtil commonDevUtil; + @Override public WeaResult> execute(Map requestInfoMap) { log.error("ZOEM_PRICE_DIFFERENCE_RATE_Action start"); @@ -44,6 +48,7 @@ public class ZOEM_PRICE_DIFFERENCE_RATE_Action extends BaseBean implements Actio log.error("userIdTemp -----"+ userIdTemp); try { String requestid = requestinfo.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestid); String wfid = requestinfo.getWorkflowid(); try { log.error(String.valueOf("ZOEM_PRICE_DIFFERENCE_RATE_Action-start-" + requestid)); @@ -165,7 +170,7 @@ public class ZOEM_PRICE_DIFFERENCE_RATE_Action extends BaseBean implements Actio BillFieldUtil util = new BillFieldUtil(); // String tablename = util.getTablename(wfid); String tablename = requestinfo.getRequestManager().getBillTableName(); - String sql = "update e10_core_business.dbo." + tablename + " set state='" + state + "',message='" + sb.toString() + "' where id=" + requestid; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + state + "',message='" + sb.toString() + "' where FORM_DATA_ID = " + dataid; log.error("sql -----"+ sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_Action.java index ef890d7..f8c644c 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_Action.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.Map; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -29,6 +30,8 @@ public class ZSRM_PUR_INFO_Action extends BaseBean implements Action, EsbServerl // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; + @Autowired + private CommonDevUtil commonDevUtil; private static final Logger logger_78218549 = LoggerFactory.getLogger(ZSRM_PUR_INFO_Action.class); @@ -46,6 +49,7 @@ public class ZSRM_PUR_INFO_Action extends BaseBean implements Action, EsbServerl try { String requestid = requestinfo.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestid); String wfid = requestinfo.getWorkflowid(); try { logger_78218549.error(String.valueOf("ZSRM_PUR_INFO_Action-start-" + requestid)); @@ -151,7 +155,7 @@ public class ZSRM_PUR_INFO_Action extends BaseBean implements Action, EsbServerl BillFieldUtil util = new BillFieldUtil(); // String tablename = util.getTablename(wfid); String tablename = requestinfo.getRequestManager().getBillTableName(); - String sql = "update e10_core_business.dbo." + tablename + " set state='" + state + "',message='" + sb.toString() + "' where id=" + requestid; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + state + "',message='" + sb.toString() + "' where FORM_DATA_ID = " + dataid; logger_78218549.error("sql -----"+ sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_GY132_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_GY132_Action.java index ccac5ca..f5bab35 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_GY132_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_GY132_Action.java @@ -5,6 +5,7 @@ import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import java.util.HashMap; import java.util.Map; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -31,6 +32,8 @@ public class ZSRM_PUR_INFO_GY132_Action extends BaseBean implements Action, EsbS // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; + @Autowired + private CommonDevUtil commonDevUtil; private static final Logger logger_8fd2ca4a = LoggerFactory.getLogger(ZSRM_PUR_INFO_GY132_Action.class); @@ -46,6 +49,7 @@ public class ZSRM_PUR_INFO_GY132_Action extends BaseBean implements Action, EsbS logger_8fd2ca4a.error("userIdTemp -----"+ userIdTemp); try { String requestid = requestinfo.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestid); String wfid = requestinfo.getWorkflowid(); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); BillFieldUtil util = new BillFieldUtil(); @@ -108,7 +112,7 @@ public class ZSRM_PUR_INFO_GY132_Action extends BaseBean implements Action, EsbS ZSRM_PUR_INFO info = new ZSRM_PUR_INFO(); String[] ret = info.Getexecute(str); logger_8fd2ca4a.error(String.valueOf("ZSRM_PUR_INFO_GY132_Action-return-" + requestid + "-[" + ret[0] + "," + ret[1] + "]")); - String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where id=" + requestid; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where FORM_DATA_ID = " + dataid; logger_8fd2ca4a.error("sql -----"+ sql); String poolname_r3 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -120,7 +124,7 @@ public class ZSRM_PUR_INFO_GY132_Action extends BaseBean implements Action, EsbS logger_8fd2ca4a.error( "ZSRM_PUR_INFO_GY132_Action-error-" ,e); requestinfo.getRequestManager().setMessageid("ERROR"); requestinfo.getRequestManager().setMessagecontent("调用SAP接口校验数据出错：" + e.toString()); - String sql = "update e10_core_business.dbo." + tablename + " set state='E',message='" + e.toString() + "' where id=" + requestid; + String sql = "update e10_core_business.dbo." + tablename + " set state='E',message='" + e.toString() + "' where FORM_DATA_ID = " + dataid; logger_8fd2ca4a.error("sql2 -----"+ sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSR_PUR_INFO_OEM_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSR_PUR_INFO_OEM_Action.java index 47ab5a8..3ce0588 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSR_PUR_INFO_OEM_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSR_PUR_INFO_OEM_Action.java @@ -51,6 +51,8 @@ public class ZSR_PUR_INFO_OEM_Action extends BaseBean implements Action, EsbServ logger_adc1e038.error("userIdTemp -----"+ userIdTemp); try { String requestid = requestinfo.getRequestid(); + String dataid = commonDevUtil.getidByrequestid(requestid); + String wfid = requestinfo.getWorkflowid(); TransUtil tu = new TransUtil(); // String tablename = tu.getTableName(wfid); @@ -72,7 +74,7 @@ public class ZSR_PUR_INFO_OEM_Action extends BaseBean implements Action, EsbServ String detailTablename = commonDevUtil.getDetailTableName(tablename,"1"); - String sql = "select count(b.id) as mxcount from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename + " b where a.form_data_id = b.form_data_id and a.id =" + requestid + " and isnull(sfbjsc,1)<>0"; + String sql = "select count(b.id) as mxcount from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename + " b where a.form_data_id = b.form_data_id and a.FORM_DATA_ID =" + dataid + " and isnull(sfbjsc,1)<>0"; logger_adc1e038.error("sql -----"+ sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -150,7 +152,7 @@ public class ZSR_PUR_INFO_OEM_Action extends BaseBean implements Action, EsbServ sb.append("信息记录新增结果：" + ret[1]); } BillFieldUtil util = new BillFieldUtil(); - sql = "update e10_core_business.dbo." + tablename + " set state='" + state + "',message='" + sb.toString() + "' where id =" + requestid; + sql = "update e10_core_business.dbo." + tablename + " set state='" + state + "',message='" + sb.toString() + "' where FORM_DATA_ID = " + dataid; logger_adc1e038.error("update sql -----"+ sql); String poolname_d9 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 diff --git a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/EasTzlhtSpzfApplicationService.java b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/EasTzlhtSpzfApplicationService.java index 8d4d08a..4c4f381 100644 --- a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/EasTzlhtSpzfApplicationService.java +++ b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/EasTzlhtSpzfApplicationService.java @@ -11,6 +11,7 @@ import com.weaver.verupgrade.conn.CONN_TYPE; import com.weaver.verupgrade.conn.RecordSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Map; @@ -23,6 +24,8 @@ import java.util.Map; */ @Service("easTzlhtSpzfApplicationWebService") public class EasTzlhtSpzfApplicationService { + @Autowired + private SecondUtil SecondUtil; private final static Logger log = LoggerFactory.getLogger(EasTzlhtSpzfApplicationService.class); @@ -83,8 +86,8 @@ public class EasTzlhtSpzfApplicationService { if ("N".equals(optType)) {//流程作废 isYX = "1"; } - - String sql = "update e10_core_business.dbo." + tablename + " set sfyx ='" + isYX + "' where id = " + requestId; + String dataid = SecondUtil.getidByrequestid(requestId); + String sql = "update e10_core_business.dbo." + tablename + " set sfyx ='" + isYX + "' where FORM_DATA_ID = " + dataid; log.error("sql:"+sql); boolean b1 = rs.executeSql(sql, poolname); diff --git a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/VendorPunishApplicationService.java b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/VendorPunishApplicationService.java index b9df002..9ecd30a 100644 --- a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/VendorPunishApplicationService.java +++ b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/VendorPunishApplicationService.java @@ -10,6 +10,7 @@ import com.weaver.verupgrade.conn.CONN_TYPE; import com.weaver.verupgrade.conn.RecordSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** @@ -21,6 +22,8 @@ import org.springframework.stereotype.Service; @Service("vendorPunishApplicationWebService") public class VendorPunishApplicationService { + @Autowired + private SecondUtil SecondUtil; private final static Logger log = LoggerFactory.getLogger(VendorPunishApplicationService.class); @@ -40,6 +43,8 @@ public class VendorPunishApplicationService { VendorPunishReqData data = param.getDATAS(); String workflowId = data.getWorkflowId(); String requestId = data.getRequestId(); + String dataid = SecondUtil.getidByrequestid(requestId); + String type = data.getType(); String isAgree = data.getIsAgree(); String supplierOpinion = data.getSupplierOpinion(); @@ -89,7 +94,7 @@ public class VendorPunishApplicationService { resData.setMessage("供应商厂商意见为空！"); return res; } - String sql = "update e10_core_business.dbo."+tablename+" set sfty='"+isAgree+"',gyscsyj='"+supplierOpinion+"' where id= '"+requestId+"'"; + String sql = "update e10_core_business.dbo."+tablename+" set sfty='"+isAgree+"',gyscsyj='"+supplierOpinion+"' where FORM_DATA_ID = " + dataid; log.error("VendorPunishApplicationImpl--sql1"+sql); boolean b1 = rs.executeSql(sql, poolname); log.error("VendorPunishApplicationImpl--"+requestId+"更新成功:b1="+b1); @@ -107,7 +112,7 @@ public class VendorPunishApplicationService { resData.setMessage("愿意承担金额必须大于0！"); return res; } - String sql = "update e10_core_business.dbo."+tablename+" set gyscsfkyj='"+supplierOpinion+"',yycdje='"+bearMoney+"' where id= '"+requestId+"'"; + String sql = "update e10_core_business.dbo."+tablename+" set gyscsfkyj='"+supplierOpinion+"',yycdje='"+bearMoney+"' where FORM_DATA_ID = " + dataid; log.error("VendorPunishApplicationImpl--sql2"+sql); boolean b1 = rs.executeSql(sql, poolname);