From 15e7cecd9b8055cbc5920462b3189ab44e9b1ad5 Mon Sep 17 00:00:00 2001 From: xinfengYin <1776570748@qq.com> Date: Mon, 24 Feb 2025 16:44:56 +0800 Subject: [PATCH 1/6] =?UTF-8?q?#xinfengYin-06#=20SY-hr05-=E7=94=A8?= =?UTF-8?q?=E5=B7=A5=E9=9C=80=E6=B1=82=E7=94=B3=E8=AF=B7=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interfaces/workflow/action/YongGongXuQiuAction.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/YongGongXuQiuAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/YongGongXuQiuAction.java index 7cd47d1..b26c61a 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/YongGongXuQiuAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/YongGongXuQiuAction.java @@ -160,7 +160,7 @@ public class YongGongXuQiuAction implements Action, EsbServerlessRpcRemoteInterf } else if (name.equals("ZBFS")) { ZBFS = value; } - log.error("main:" + requestid + " " + name + " " + value); + logger_42aadd27.error(" YongGongXuQiuAction main:" + requestid + " " + name + " " + value); } if (!"".equals(LZBY)) { XQYY = LZBY; @@ -186,6 +186,7 @@ public class YongGongXuQiuAction implements Action, EsbServerlessRpcRemoteInterf // PositionStatus = "1"; // } try { + logger_42aadd27.error("YongGongXuQiuAction endPoint" ); // ApplyPositionFormWS(XQBM,XQGW,SQRQ,Integer.parseInt(XQRS),XWBDRQ,ZBFS2,XQYY1); // JobCodeToDeptFormWS(XQBM,XQGW,createrId,SQRQ); String endPoint = "http://10.6.2.12/hengtongws/HengtongWebService.asmx"; @@ -204,9 +205,9 @@ public class YongGongXuQiuAction implements Action, EsbServerlessRpcRemoteInterf call1.setReturnType(new QName(soapaction, "ApplyPositionFormWS"), String.class); call1.setUseSOAPAction(true); call1.setSOAPActionURI(soapaction + "ApplyPositionFormWS"); - log.error("DeptID:" + DeptID + "positionID" + positionID); + logger_42aadd27.error("DeptID:" + DeptID + "positionID" + positionID); String str = (String) call1.invoke(new Object[] { DeptID, positionID, SQRQ, XQRS, XWBDQX, ZBFS2, XQYY }); - log.error("str:" + str); + logger_42aadd27.error("str:" + str); if (!str.equals("SUCCESS")) { request.getRequestManager().setMessageid("100002"); request.getRequestManager().setMessagecontent(str); From 9f2063149a4188625a9b14e0407889e931a0da79 Mon Sep 17 00:00:00 2001 From: yangzt Date: Mon, 24 Feb 2025 17:10:17 +0800 Subject: [PATCH 2/6] =?UTF-8?q?yzt-20250224-=E9=97=AE=E9=A2=98=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=BA=8F=E5=8F=B7648?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interfaces/workflow/action/ARSPaymentRecepitAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bf2f062..8be777f 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 @@ -130,7 +130,7 @@ public class ARSPaymentRecepitAction extends BaseBean implements Action, EsbServ obj.put("OAID", workflowid); logger_c29b3679.error(" operate " + newoperate); - obj.put("OPERATETYPE", 1); + obj.put("OPERATETYPE", newoperate); logger_c29b3679.error(" obj " + obj.toJSONString()); HttpClient client = new DefaultHttpClient(); From 33157b3475ed114816792c4dc8e6cbe188e45097 Mon Sep 17 00:00:00 2001 From: xinfengYin <1776570748@qq.com> Date: Mon, 24 Feb 2025 17:11:29 +0800 Subject: [PATCH 3/6] =?UTF-8?q?#xinfengYin-07#=20SY-hr05-=E7=94=A8?= =?UTF-8?q?=E5=B7=A5=E9=9C=80=E6=B1=82=E7=94=B3=E8=AF=B7=E6=B5=81=E7=A8=8B?= =?UTF-8?q?-02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/action/OaSrmVendorAdmitAction.java | 12 +++++++++++- .../workflow/action/YongGongXuQiuAction.java | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) 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 6e724cc..65db3c8 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 @@ -121,7 +121,7 @@ public class OaSrmVendorAdmitAction extends BaseBean implements Action, EsbServe // 现有合格供应商 String xyhggys = String.valueOf(map.get("XYHGGYSMC")); VdDlvApplyHandlerServiceServiceStub.DlvApplyIn dlvapplyin = new VdDlvApplyHandlerServiceServiceStub.DlvApplyIn(); - dlvapplyin.setRequestId(Integer.parseInt(requestid)); + dlvapplyin.setRequestId(Integer.parseInt(getFormno(requestid))); dlvapplyin.setApplyNo(lcbh); dlvapplyin.setCompanyCode(sqdwbm); dlvapplyin.setCompanyName(sqdw); @@ -193,6 +193,16 @@ public class OaSrmVendorAdmitAction extends BaseBean implements Action, EsbServe } } + public String getFormno(String requestid){ + String formno = ""; + if(requestid.length()>8){ + formno = "1"+requestid.substring(requestid.length()-8); + }else{ + formno = requestid; + } + return formno; + } + Map getResultMapForAction(Map map, String key, Object value, RequestManager requestManager) { if (key != null && !key.isEmpty()) { map.put(key, value); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/YongGongXuQiuAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/YongGongXuQiuAction.java index b26c61a..a7ac5bd 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/YongGongXuQiuAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/YongGongXuQiuAction.java @@ -215,7 +215,7 @@ public class YongGongXuQiuAction implements Action, EsbServerlessRpcRemoteInterf } } catch (Exception e) { - System.err.println(e.toString()); + logger_42aadd27.error("YongGongXuQiuAction catchErr:" + e.toString()); return WeaResult.fail(500, "YongGongXuQiuAction err"+ e, getResultMapForAction(weaverResultMap, "result",e.getMessage(), request.getRequestManager())); } From f6649e72340a3e8c4393a9bce771da060b245cee Mon Sep 17 00:00:00 2001 From: qijirenjian Date: Mon, 24 Feb 2025 17:21:39 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=BB=BA=E6=A8=A1=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oames/CallMesWLPS_SYService.java | 0 .../workflow/action/Action20210802092416.java | 0 .../action/UpdateSecLevelAndLockStatus.java | 30 +++++++++++-------- 3 files changed, 17 insertions(+), 13 deletions(-) create mode 100644 secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/oames/CallMesWLPS_SYService.java create mode 100644 secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/Action20210802092416.java diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/oames/CallMesWLPS_SYService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/oames/CallMesWLPS_SYService.java new file mode 100644 index 0000000..e69de29 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/Action20210802092416.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/Action20210802092416.java new file mode 100644 index 0000000..e69de29 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateSecLevelAndLockStatus.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateSecLevelAndLockStatus.java index ab7def2..97a0c82 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateSecLevelAndLockStatus.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateSecLevelAndLockStatus.java @@ -39,22 +39,24 @@ public class UpdateSecLevelAndLockStatus implements EsbServerlessRpcRemoteInterf * @return */ public WeaResult> execute(Map param) { + + logger_b15f4fa5.error("htjt_mode_UpdateSecLevelAndLockStatus start param == " + param); + // 构建E9 requestInfo对象参数 I18nContextUtil.getBean(GetCubeBtnActionParam.class).getCubeBtnActionParam(param); + + Long billid = Long.parseLong(String.valueOf(param.getOrDefault("billid", -1))); + logger_b15f4fa5.error("billid == "+ billid ); + Map result = new HashMap(); try { - User user = (User) param.get("user"); - // 数据id - int billid = -1; - // 模块id - int modeid = -1; - RequestInfo requestInfo = (RequestInfo) param.get("RequestInfo"); - if (requestInfo != null) { - billid = Util.getIntValue(requestInfo.getRequestid()); - modeid = Util.getIntValue(requestInfo.getWorkflowid()); - if (billid > 0 && modeid > 0) { + + + if (billid != null) { + + if (billid > 0 ) { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "select * from uf_sellevellock_chg where id=" + billid; + String sql = "select * from e10_common.dbo.uf_sellevellock_chg where id=" + billid; String ry = ""; String aqjb = ""; String zhsd = ""; @@ -67,8 +69,9 @@ public class UpdateSecLevelAndLockStatus implements EsbServerlessRpcRemoteInterf if ("".equals(zhsd)) { zhsd = "0"; } - sql = "update employee as hrmresource set seclevel=" + aqjb + ",passwordlock=" + zhsd + " where id=" + ry + ""; - rs.execute(sql); + sql = "update eteams.dbo.employee as hrmresource set seclevel=" + aqjb + ",passwordlock=" + zhsd + " where id=" + ry + ""; + boolean execute = rs.execute(sql); + logger_b15f4fa5.error("execute == "+ execute ); ResourceComInfo rci = I18nContextUtil.getBean(ResourceComInfo.class); rci.updateResourceInfoCache(ry); } @@ -79,6 +82,7 @@ public class UpdateSecLevelAndLockStatus implements EsbServerlessRpcRemoteInterf return WeaResult.fail(500, "UpdateSecLevelAndLockStatus e {}"+ e); } + logger_b15f4fa5.error("htjt_mode_UpdateSecLevelAndLockStatus stop result == " + result); return WeaResult.success(new HashMap<>(result)); } } From f22ad3263dec5a34065f250309979bd540ef9b48 Mon Sep 17 00:00:00 2001 From: xinfengYin <1776570748@qq.com> Date: Tue, 25 Feb 2025 09:43:01 +0800 Subject: [PATCH 5/6] =?UTF-8?q?#xinfengYin-08#=20SY-hr05-=E7=94=A8?= =?UTF-8?q?=E5=B7=A5=E9=9C=80=E6=B1=82=E7=94=B3=E8=AF=B7=E6=B5=81=E7=A8=8B?= =?UTF-8?q?-03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/action/OaSrmVendorAdmitAction.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) 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 65db3c8..37c2ec3 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 @@ -121,7 +121,9 @@ public class OaSrmVendorAdmitAction extends BaseBean implements Action, EsbServe // 现有合格供应商 String xyhggys = String.valueOf(map.get("XYHGGYSMC")); VdDlvApplyHandlerServiceServiceStub.DlvApplyIn dlvapplyin = new VdDlvApplyHandlerServiceServiceStub.DlvApplyIn(); + logger_9af84826.error("setRequestId ========start============="); dlvapplyin.setRequestId(Integer.parseInt(getFormno(requestid))); + logger_9af84826.error("setRequestId =========end============"); dlvapplyin.setApplyNo(lcbh); dlvapplyin.setCompanyCode(sqdwbm); dlvapplyin.setCompanyName(sqdw); @@ -143,11 +145,11 @@ public class OaSrmVendorAdmitAction extends BaseBean implements Action, EsbServe dlvapplyin.setVendorType(gyslxmc); int dtcount = 0; String sql = "select b.* from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + tablename + "_dt3 b where a.form_data_id=b.form_data_id and a.id=" + requestid; - logger_9af84826.error("sql-->" + sql); + logger_9af84826.error("OaSrmVendorAdmitAction sql-->" + sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 boolean b = rs.executeSql(sql, poolname); - logger_9af84826.error("b-->" + b); + logger_9af84826.error("OaSrmVendorAdmitAction b-->" + b); dtcount = rs.getCounts(); if (dtcount > 0) { int index = 0; @@ -193,7 +195,7 @@ public class OaSrmVendorAdmitAction extends BaseBean implements Action, EsbServe } } - public String getFormno(String requestid){ + public String getFormno(String requestid){ String formno = ""; if(requestid.length()>8){ formno = "1"+requestid.substring(requestid.length()-8); @@ -217,4 +219,9 @@ public class OaSrmVendorAdmitAction extends BaseBean implements Action, EsbServe } return map; } + +// public static void main(String[] args) { +// String cs = "1104617940341235715"; +// System.out.println(Integer.parseInt(getFormno(cs))); +// } } From 63fe22d9be9a33372f601018dda4c88b92fd8f14 Mon Sep 17 00:00:00 2001 From: yangzt Date: Tue, 25 Feb 2025 10:30:44 +0800 Subject: [PATCH 6/6] =?UTF-8?q?yzt-20250224-=E9=97=AE=E9=A2=98=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=BA=8F=E5=8F=B7644-2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interfaces/workflow/action/ARSPaymentRecepitAction.java | 2 ++ 1 file changed, 2 insertions(+) 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 8be777f..906ce1d 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 @@ -132,6 +132,8 @@ public class ARSPaymentRecepitAction extends BaseBean implements Action, EsbServ logger_c29b3679.error(" operate " + newoperate); obj.put("OPERATETYPE", newoperate); logger_c29b3679.error(" obj " + obj.toJSONString()); + logger_c29b3679.error(" newoperate " + obj.get("OPERATETYPE")); + HttpClient client = new DefaultHttpClient(); // String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htcrmoasync.CreateBilling")).trim();