From d3123792a01b750d7e61e457a85d975f6273241c Mon Sep 17 00:00:00 2001 From: xinfengYin <1776570748@qq.com> Date: Thu, 27 Feb 2025 18:44:56 +0800 Subject: [PATCH] =?UTF-8?q?#xinfengYin-16#=20CW26=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E8=BF=87=E7=A8=8B=E4=B8=AD=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/action/OaSrmVenMatExtAction.java | 24 +++++++-- .../action/SCFAndEASApplyUserSyncAction.java | 52 +++++++++++-------- 2 files changed, 49 insertions(+), 27 deletions(-) diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVenMatExtAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVenMatExtAction.java index f9d5b04..6be1c5c 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVenMatExtAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVenMatExtAction.java @@ -131,22 +131,38 @@ public class OaSrmVenMatExtAction extends BaseBean implements Action, EsbServerl } logger_e97618d9.error(String.valueOf(requestid + "GY104--建议处理类型" + cllx)); DetailTable[] detailtable = null; - if (requestinfo.getDetailTableInfo() != null) { + if (requestinfo != null && requestinfo.getDetailTableInfo() != null) { detailtable = requestinfo.getDetailTableInfo().getDetailTable(); } + DetailTable dtq = null; if (detailtable != null && detailtable.length > 0) { dtq = detailtable[0]; } + + logger_e97618d9.error("dtq===> "+dtq); Row[] sq = null; - if (dtq != null && dtq.getRow() != null) { - sq = dtq.getRow(); + if (dtq != null) { + logger_e97618d9.error("dtq != null===> "+dtq); + try { + // 尝试获取 dtq 的行 + if (dtq.getRow() != null) { + sq = dtq.getRow(); + } + } catch (NullPointerException e) { + // 捕获并记录异常信息 + logger_e97618d9.error("调用 dtq.getRow() 时发生 NullPointerException: " + e.getMessage()); + } } SRM_OA_VENMATEXT_RESULT param = new SRM_OA_VENMATEXT_RESULT(); VenMatExtResultIn paramInfo = new VenMatExtResultIn(); Set set = new HashSet(); - VenMatExtResultItemIn[] item = new VenMatExtResultItemIn[sq.length]; + int length = 0; + if(sq != null){ + length = sq.length; + } + VenMatExtResultItemIn[] item = new VenMatExtResultItemIn[length]; if (sq != null && ( "6".equals(cllx) || "7".equals(cllx))) { for (int j = 0; j < sq.length; j++) { // 指定行 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SCFAndEASApplyUserSyncAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SCFAndEASApplyUserSyncAction.java index d7aac35..28028d2 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SCFAndEASApplyUserSyncAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SCFAndEASApplyUserSyncAction.java @@ -177,38 +177,44 @@ public class SCFAndEASApplyUserSyncAction extends BaseBean implements Action, Es String poolname_7m = CONN_TYPE.workflow.getType(); /*开票申请 TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - boolean b1 = rs.executeSql("update e10_common.dbo.uf_applyUser set " + "'E10无此字段formmodeid'='139'" + ", modedatacreater=" + sqr + ", 'E10无此字段modedatacreatertype'= '0'" + ", modedatacreatedate= '" + currentdate + "'" + ", modedatacreatetime= '" + currenttime + "'" + ", oafqr=" + list.get(i).get("oafqr") + ",oafqrgh='" + list.get(i).get("oafqrgh") + "'" + " where companycode='" + companyCode + "' and lclx=" + list.get(i).get("lclx"), poolname_7m); + // boolean b1 = rs.executeSql("update e10_common.dbo.uf_applyUser set " + "'E10无此字段formmodeid'='139'" + ", modedatacreater=" + sqr + ", 'E10无此字段modedatacreatertype'= '0'" + ", modedatacreatedate= '" + currentdate + "'" + ", modedatacreatetime= '" + currenttime + "'" + ", oafqr=" + list.get(i).get("oafqr") + ",oafqrgh='" + list.get(i).get("oafqrgh") + "'" + " where companycode='" + companyCode + "' and lclx=" + list.get(i).get("lclx"), poolname_7m); + boolean b1 = rs.executeSql("update e10_common.dbo.uf_applyUser set oafqr=" + list.get(i).get("oafqr") + ",oafqrgh='" + list.get(i).get("oafqrgh") + "'" + " where companycode='" + companyCode + "' and lclx=" + list.get(i).get("lclx"), poolname_7m); logger_c018d513.error("b1 -----"+ b1); } else { String poolname_19 = CONN_TYPE.workflow.getType(); /*直贷业务 TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - boolean b1 = rs.executeSql("update e10_common.dbo.uf_applyUser set " + "'E10无此字段formmodeid'='139'" + ", modedatacreater=" + sqr + ", 'E10无此字段modedatacreatertype'= '0'" + ", modedatacreatedate= '" + currentdate + "'" + ", modedatacreatetime= '" + currenttime + "'" + ", oafqr=" + list.get(i).get("oafqr") + ",oafqrgh='" + list.get(i).get("oafqrgh") + "'" + ", easfqr=" + list.get(i).get("oafqr") + ",easfqrgh='" + list.get(i).get("oafqrgh") + "'" + " where companycode='" + companyCode + "' and lclx=" + list.get(i).get("lclx"), poolname_19); + // boolean b1 = rs.executeSql("update e10_common.dbo.uf_applyUser set " + "'E10无此字段formmodeid'='139'" + ", modedatacreater=" + sqr + ", 'E10无此字段modedatacreatertype'= '0'" + ", modedatacreatedate= '" + currentdate + "'" + ", modedatacreatetime= '" + currenttime + "'" + ", oafqr=" + list.get(i).get("oafqr") + ",oafqrgh='" + list.get(i).get("oafqrgh") + "'" + ", easfqr=" + list.get(i).get("oafqr") + ",easfqrgh='" + list.get(i).get("oafqrgh") + "'" + " where companycode='" + companyCode + "' and lclx=" + list.get(i).get("lclx"), poolname_19); + boolean b1 = rs.executeSql("update e10_common.dbo.uf_applyUser set oafqr=" + list.get(i).get("oafqr") + ",oafqrgh='" + list.get(i).get("oafqrgh") + "'" + ", easfqr=" + list.get(i).get("oafqr") + ",easfqrgh='" + list.get(i).get("oafqrgh") + "'" + " where companycode='" + companyCode + "' and lclx=" + list.get(i).get("lclx"), poolname_19); logger_c018d513.error("b1 -----"+ b1); } // rs.execute("update uf_applyUser set oafqr="+list.get(i).get("oafqr")+",oafqrgh='"+list.get(i).get("oafqrgh")+"',easfqr="+list.get(i).get("easfqr")+",easfqrgh='"+list.get(i).get("easfqrgh")+"' where companycode='"+companyCode+"' and lclx="+list.get(i).get("lclx")); - } else { - String uuid = UUID.randomUUID().toString(); - if ("0".equals(lclx)) { - String poolname_qw = CONN_TYPE.workflow.getType(); - // 开票申请 - /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 - TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - long generate = IdGenerator.generate(); - boolean b1 = rs.executeSql("insert into e10_common.dbo.uf_applyUseruf_applyUser(companycode,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime," + "lclx,oafqr,oafqrgh,modeuuid) " + "values('" + companyCode + "'," + "'139'," + sqr + "," + "'0'," + "'" + currentdate + "'," + "'" + currenttime + "'," + list.get(i).get("lclx") + "," + list.get(i).get("oafqr") + ",'" + list.get(i).get("oafqrgh") + "','" + uuid + "')", poolname_qw, generate); - logger_c018d513.error("b1 -----"+ b1); - } else { - String poolname_2n = CONN_TYPE.workflow.getType(); - /*直贷业务 - TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 - TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - long generate = IdGenerator.generate(); - boolean b1 = rs.executeSql("insert into e10_common.dbo.uf_applyUseruf_applyUser(companycode,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime," + "lclx,oafqr,oafqrgh,easfqr,easfqrgh,modeuuid) " + "values('" + companyCode + "'," + "'139'," + sqr + "," + "'0'," + "'" + currentdate + "'," + "'" + currenttime + "'," + list.get(i).get("lclx") + "," + list.get(i).get("oafqr") + ",'" + list.get(i).get("oafqrgh") + "'," + list.get(i).get("oafqr") + ",'" + list.get(i).get("oafqrgh") + "','" + uuid + // DiscountedInvoiceApplicationImpl 使用eas发起人 - "')", poolname_2n, generate); - logger_c018d513.error("b1 -----"+ b1); - } - // rs.execute("F"); } + /*TODO + 建模需要确认数据插入如何实行（唯一值怎么确认 如formmodeid，modeUUID等等 2025/02/27） + */ +// else { +// String uuid = UUID.randomUUID().toString(); +// if ("0".equals(lclx)) { +// String poolname_qw = CONN_TYPE.workflow.getType(); +// // 开票申请 +// /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 +// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ +// long generate = IdGenerator.generate(); +// boolean b1 = rs.executeSql("insert into e10_common.dbo.uf_applyUseruf_applyUser(companycode,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime," + "lclx,oafqr,oafqrgh,modeuuid) " + "values('" + companyCode + "'," + "'139'," + sqr + "," + "'0'," + "'" + currentdate + "'," + "'" + currenttime + "'," + list.get(i).get("lclx") + "," + list.get(i).get("oafqr") + ",'" + list.get(i).get("oafqrgh") + "','" + uuid + "')", poolname_qw, generate); +// logger_c018d513.error("b1 -----"+ b1); +// } else { +// String poolname_2n = CONN_TYPE.workflow.getType(); +// /*直贷业务 +// TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 +// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ +// long generate = IdGenerator.generate(); +// boolean b1 = rs.executeSql("insert into e10_common.dbo.uf_applyUseruf_applyUser(companycode,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime," + "lclx,oafqr,oafqrgh,easfqr,easfqrgh,modeuuid) " + "values('" + companyCode + "'," + "'139'," + sqr + "," + "'0'," + "'" + currentdate + "'," + "'" + currenttime + "'," + list.get(i).get("lclx") + "," + list.get(i).get("oafqr") + ",'" + list.get(i).get("oafqrgh") + "'," + list.get(i).get("oafqr") + ",'" + list.get(i).get("oafqrgh") + "','" + uuid + // DiscountedInvoiceApplicationImpl 使用eas发起人 +// "')", poolname_2n, generate); +// logger_c018d513.error("b1 -----"+ b1); +// } +// // rs.execute("F"); +// } } }