From b20a4bf935e1d8f723ba9c280c17413e6ba424d4 Mon Sep 17 00:00:00 2001 From: qijirenjian Date: Tue, 24 Dec 2024 16:58:00 +0800 Subject: [PATCH] webservice --- .../workflow/action/CustomTeAction.java | 3 +- .../workflow/action/ZOA_SL_GWCC_Action.java | 8 +- .../workflow/action/ZOA_STATUS_RFCAction.java | 4 +- .../action/ZOEM_MATRIAL_PRICE_Action.java | 2 +- .../ZOEM_PRICE_DIFFERENCE_RATE_Action.java | 2 +- .../action/ZOEM_PROCESSING_CHARGE_Action.java | 2 +- .../workflow/action/ZSRM_PUR_INFO_Action.java | 2 +- .../action/ZSRM_PUR_INFO_GY107_Action.java | 4 +- .../ZSRM_PUR_INFO_GY107_CheckAction.java | 4 + .../action/ZSRM_PUR_INFO_GY132_Action.java | 4 +- .../action/ZSR_PUR_INFO_OEM_Action.java | 4 +- .../action/ZWZX_CG_FileUploadAction.java | 2 +- .../action/ZZ_Ten_GDFileUploadAction.java | 4 +- .../seconddev/service/InHrmResource.java | 29 ++ .../seconddev/service/entity/HrmResource.java | 293 ++++++++++++++++++ .../service/entity/HrmResourceReq.java | 52 ++++ 16 files changed, 399 insertions(+), 20 deletions(-) create mode 100644 secondev-history-action/src/main/java/com/weaver/seconddev/service/InHrmResource.java create mode 100644 secondev-history-action/src/main/java/com/weaver/seconddev/service/entity/HrmResource.java create mode 100644 secondev-history-action/src/main/java/com/weaver/seconddev/service/entity/HrmResourceReq.java diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CustomTeAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CustomTeAction.java index 8c7b5fb..af32a2a 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CustomTeAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CustomTeAction.java @@ -74,7 +74,8 @@ public class CustomTeAction extends BaseBean implements Action, EsbServerlessRpc RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); try { - + List list = new ArrayList(); + list.get(2); // 测试配置文件读取 // String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("weaver-secondev-htportaloaUrl.accountUrl")).trim(); 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 8222d7b..e515a32 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 @@ -494,7 +494,7 @@ public class ZOA_SL_GWCC_Action extends BaseBean implements Action, EsbServerles logUtil.setJkzt("1"); logUtil.insertLog(); str = Message; - String sql1 = "update " + tablename + " set message = isnull(cast(message as varchar(8000)),'') + '" + Message + "' where requestId = " + reid; + String sql1 = "update e10_core_business.dbo." + tablename + " set message = isnull(cast(message as varchar(8000)),'') + '" + Message + "' where requestId = " + reid; logger_f5224b91.info(String.valueOf("sql1:" + sql1)); String poolname = CONN_TYPE.workflow.getType(); @@ -612,7 +612,7 @@ public class ZOA_SL_GWCC_Action extends BaseBean implements Action, EsbServerles message = "--商旅接口回写说明--ReturnCode:" + strResult[0] + "；ReturnERRORMessage:" + strResult[1] + "；ReturnPassword:" + strResult[2] + "；ReturnBillNum:" + strResult[3]; message = message.replace("'", "’"); if (!tablename.equals("")) { - String logsql = "update " + tablename + " set status ='" + status + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where requestId = " + reid; + String logsql = "update e10_core_business.dbo." + tablename + " set status ='" + status + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where requestId = " + reid; logger_f5224b91.info(String.valueOf("logsql:" + logsql)); String poolname_6c = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -637,7 +637,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 " + tablename + " set status ='" + status + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where requestId = " + reid; + String logsql2 = "update e10_core_business.dbo." + tablename + " set status ='" + status + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where requestId = " + reid; logger_f5224b91.info(String.valueOf("logsql2:" + logsql2)); String poolname_t9 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -714,7 +714,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 " + tablename + " set status ='" + dTtrip[0] + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where requestId = " + reid; + String logsql4 = "update e10_core_business.dbo." + tablename + " set status ='" + dTtrip[0] + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where requestId = " + reid; logger_f5224b91.info(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_STATUS_RFCAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_STATUS_RFCAction.java index 3489d35..49f361f 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_STATUS_RFCAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_STATUS_RFCAction.java @@ -85,7 +85,7 @@ public class ZOA_STATUS_RFCAction extends BaseBean implements Action, EsbServerl retstr[1] = jcofunction.getExportParameterList().getValue("E_MESSAGE").toString(); logger_2bfe536a.info(String.valueOf("调用ZOA_STATUS_RFC函数成功：" + retstr[0] + "," + retstr[1])); } - String sql = "update " + tablename + " set status= '" + retstr[0] + "',message= cast(message as varchar(8000)) +'," + retstr[1] + "' where requestId =" + requestid; + String sql = "update e10_core_business.dbo." + tablename + " set status= '" + retstr[0] + "',message= cast(message as varchar(8000)) +'," + retstr[1] + "' where requestId =" + requestid; logger_2bfe536a.info("sql -----"+ sql); String poolname_vx = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -100,7 +100,7 @@ public class ZOA_STATUS_RFCAction extends BaseBean implements Action, EsbServerl logger_2bfe536a.info(String.valueOf("调用ZOA_STATUS_RFC更新审批不通过状态出错：" + e.toString())); requestinfo.getRequestManager().setMessageid("ERROR"); requestinfo.getRequestManager().setMessagecontent("调用SAP接口出错：" + e.getMessage()); - String sql = "update " + tablename + " set status= '" + retstr[0] + "',message= cast(message as varchar(8000)) +'," + retstr[1] + "' where requestId =" + requestid; + String sql = "update e10_core_business.dbo." + tablename + " set status= '" + retstr[0] + "',message= cast(message as varchar(8000)) +'," + retstr[1] + "' where requestId =" + requestid; logger_2bfe536a.info("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/ZOEM_MATRIAL_PRICE_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOEM_MATRIAL_PRICE_Action.java index 40bd2c3..e3a9564 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOEM_MATRIAL_PRICE_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOEM_MATRIAL_PRICE_Action.java @@ -101,7 +101,7 @@ public class ZOEM_MATRIAL_PRICE_Action extends BaseBean implements Action, EsbSe BillFieldUtil util = new BillFieldUtil(); // String tablename = util.getTablename(wfid); String tablename = requestinfo.getRequestManager().getBillTableName(); - String sql = "update " + tablename + " set state='" + state + "',message='" + sb.toString() + "' where requestid=" + requestid; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + state + "',message='" + sb.toString() + "' where requestid=" + requestid; logger_8aa7358c.info("sql -----"+ sql); String poolname = CONN_TYPE.workflow.getType(); 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 6c25ee7..f2f7c81 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 @@ -156,7 +156,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 " + tablename + " set state='" + state + "',message='" + sb.toString() + "' where requestid=" + requestid; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + state + "',message='" + sb.toString() + "' where requestid=" + requestid; logger_69cd5f8c.info("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/ZOEM_PROCESSING_CHARGE_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOEM_PROCESSING_CHARGE_Action.java index fc0d142..f17249f 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOEM_PROCESSING_CHARGE_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOEM_PROCESSING_CHARGE_Action.java @@ -100,7 +100,7 @@ public class ZOEM_PROCESSING_CHARGE_Action extends BaseBean implements Action, E BillFieldUtil util = new BillFieldUtil(); // String tablename = util.getTablename(wfid); String tablename = requestinfo.getRequestManager().getBillTableName(); - String sql = "update " + tablename + " set state='" + state + "',message='" + sb.toString() + "' where requestid=" + requestid; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + state + "',message='" + sb.toString() + "' where requestid=" + requestid; logger_9b3f3cb8.info("sql -----"+ sql); String poolname = CONN_TYPE.workflow.getType(); 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 b4753ed..d9ef5f2 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 @@ -142,7 +142,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 " + tablename + " set state='" + state + "',message='" + sb.toString() + "' where requestid=" + requestid; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + state + "',message='" + sb.toString() + "' where requestid=" + requestid; logger_78218549.info("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_GY107_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_GY107_Action.java index 09ee8d2..535ee57 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_GY107_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_GY107_Action.java @@ -101,7 +101,7 @@ public class ZSRM_PUR_INFO_GY107_Action extends BaseBean implements Action, EsbS ZSRM_PUR_INFO info = new ZSRM_PUR_INFO(); String[] ret = info.Getexecute(str); logger_da6b5da2.info(String.valueOf("ZSRM_PUR_INFO_GY107_Action-return-" + requestid + "-[" + ret[0] + "," + ret[1] + "]")); - String sql = "update e10_core_business." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where requestid=" + requestid; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where requestid=" + requestid; logger_da6b5da2.info("sql -----"+ sql); String poolname_mm = CONN_TYPE.workflow.getType(); @@ -114,7 +114,7 @@ public class ZSRM_PUR_INFO_GY107_Action extends BaseBean implements Action, EsbS logger_da6b5da2.info(String.valueOf("ZSRM_PUR_INFO_GY107_Action-error-" + requestid + "-[" + e.toString() + "]")); requestinfo.getRequestManager().setMessageid("ERROR"); requestinfo.getRequestManager().setMessagecontent("调用SAP接口校验数据出错：" + e.toString()); - String sql = "update e10_core_business." + tablename + " set state='E',message='" + e.toString() + "' where requestid=" + requestid; + String sql = "update e10_core_business.dbo." + tablename + " set state='E',message='" + e.toString() + "' where requestid=" + requestid; logger_da6b5da2.info("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/ZSRM_PUR_INFO_GY107_CheckAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_GY107_CheckAction.java index 82249de..6ffda01 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_GY107_CheckAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_GY107_CheckAction.java @@ -52,8 +52,10 @@ public class ZSRM_PUR_INFO_GY107_CheckAction extends BaseBean implements Action, sync = value; } } + logger_6ccd4d72.info("sync -----"+ sync); if ("0".equals(sync)) { DetailTable[] detailtable = requestinfo.getDetailTableInfo().getDetailTable(); + logger_6ccd4d72.info("detailtable -----"+ detailtable.toString()); DetailTable dtq = detailtable[0]; Row[] sq = dtq.getRow(); if (sq.length > 0) { @@ -81,8 +83,10 @@ public class ZSRM_PUR_INFO_GY107_CheckAction extends BaseBean implements Action, str[j][10] = map.get("YTJJHSJ"); str[j][11] = map.get("XSGMSDM"); str[j][12] = map.get("JLFL"); + logger_6ccd4d72.info("YXQSRQ -----"+ map.get("YXQSRQ")); str[j][13] = map.get("YXQSRQ").replaceAll("-", ""); str[j][14] = map.get("YXJZRQ").replaceAll("-", ""); + logger_6ccd4d72.info("YXJZRQ -----"+ map.get("YXJZRQ")); str[j][15] = map.get("JJG"); str[j][16] = map.get("JGDW"); str[j][17] = map.get("GYSWLZ"); 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 578efca..b9ad022 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 @@ -102,7 +102,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.info(String.valueOf("ZSRM_PUR_INFO_GY132_Action-return-" + requestid + "-[" + ret[0] + "," + ret[1] + "]")); - String sql = "update e10_core_business." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where requestid=" + requestid; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where requestid=" + requestid; logger_8fd2ca4a.info("sql -----"+ sql); String poolname_r3 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -114,7 +114,7 @@ public class ZSRM_PUR_INFO_GY132_Action extends BaseBean implements Action, EsbS logger_8fd2ca4a.info(String.valueOf("ZSRM_PUR_INFO_GY132_Action-error-" + requestid + "-[" + e.toString() + "]")); requestinfo.getRequestManager().setMessageid("ERROR"); requestinfo.getRequestManager().setMessagecontent("调用SAP接口校验数据出错：" + e.toString()); - String sql = "update e10_core_business." + tablename + " set state='E',message='" + e.toString() + "' where requestid=" + requestid; + String sql = "update e10_core_business.dbo." + tablename + " set state='E',message='" + e.toString() + "' where requestid=" + requestid; logger_8fd2ca4a.info("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 44cf42e..3fd30a9 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 @@ -66,7 +66,7 @@ public class ZSR_PUR_INFO_OEM_Action extends BaseBean implements Action, EsbServ StringBuilder sb = new StringBuilder(); String state = ""; int mxcount = 0; - String sql = "select count(b.id) as mxcount from " + tablename + " a," + tablename + "_dt1 b where a.id = b.mainid and a.requestId =" + 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." + tablename + "_dt1 b where a.id = b.mainid and a.requestId =" + requestid + " and isnull(sfbjsc,1)<>0"; logger_adc1e038.info("sql -----"+ sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -143,7 +143,7 @@ public class ZSR_PUR_INFO_OEM_Action extends BaseBean implements Action, EsbServ sb.append("信息记录新增结果：" + ret[1]); } BillFieldUtil util = new BillFieldUtil(); - sql = "update " + tablename + " set state='" + state + "',message='" + sb.toString() + "' where requestid=" + requestid; + sql = "update e10_core_business.dbo." + tablename + " set state='" + state + "',message='" + sb.toString() + "' where requestid=" + requestid; logger_adc1e038.info("update sql -----"+ sql); String poolname_d9 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZWZX_CG_FileUploadAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZWZX_CG_FileUploadAction.java index def9619..33f3108 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZWZX_CG_FileUploadAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZWZX_CG_FileUploadAction.java @@ -147,7 +147,7 @@ public class ZWZX_CG_FileUploadAction extends BaseBean implements Action, EsbSer String[] docs = fileIds.split(","); for (int i = 0; i < docs.length; i++) { String docid = docs[i]; - String sql = " select b.filerealpath,b.iszip,b.name,b.imagefileid from " + " e10_common.dbo.fileobj b where b.imagefileid in(select max(imagefileid) " + "from e10_core_business.dbo.document_main_access as docimagefile where docid in(" + docid + ") group by docid)"; + String sql = " select b.filerealpath,b.iszip,b.name,b.imagefileid from " + " e10_core_business.dbo.fileobj b where b.imagefileid in(select max(imagefileid) " + "from e10_core_business.dbo.document_main_access as docimagefile where docid in(" + docid + ") group by docid)"; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_Ten_GDFileUploadAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_Ten_GDFileUploadAction.java index 925668a..2a97fdc 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_Ten_GDFileUploadAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_Ten_GDFileUploadAction.java @@ -157,7 +157,7 @@ public class ZZ_Ten_GDFileUploadAction extends BaseBean implements Action, EsbSe String[] docs = fileIds.split(","); for (int i = 0; i < docs.length; i++) { String docid = docs[i]; - String sql = " select b.filerealpath,b.iszip,b.name,b.imagefileid from " + " e10_core_business.dbo.fileobj b where b.imagefileid in(select max(imagefileid) " + "from document_main_access as docimagefile where docid in(" + docid + ") group by docid)"; + String sql = " select b.filerealpath,b.iszip,b.name,b.imagefileid from " + " e10_core_business.dbo.fileobj b where b.imagefileid in(select max(imagefileid) " + "from e10_core_business.dbo.document_main_access as docimagefile where docid in(" + docid + ") group by docid)"; logger_8ab26152.info("sql -----"+ sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -300,7 +300,7 @@ public class ZZ_Ten_GDFileUploadAction extends BaseBean implements Action, EsbSe RecordSet recordSet = I18nContextUtil.getBean(RecordSet.class); String poolname_w2 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - String sql = "select c.name from wfp_base a " + "INNER JOIN e10_common.dbo.form_field b on a.formid=b.form_id " + "INNER JOIN e10_common.dbo.field_option c on b.id=c.field_id " + "where b.fieldname='" + fieldname + "' and a.id=" + workflowid + " and c.selectvalue=" + selectvalue; + String sql = "select c.name from e10_common.dbo.wfp_base a " + "INNER JOIN e10_common.dbo.form_field b on a.formid=b.form_id " + "INNER JOIN e10_common.dbo.field_option c on b.id=c.field_id " + "where b.fieldname='" + fieldname + "' and a.id=" + workflowid + " and c.selectvalue=" + selectvalue; logger_8ab26152.info("getselectNameByCol sql = " + sql); recordSet.executeSql(sql, poolname_w2); if (recordSet.next()) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/service/InHrmResource.java b/secondev-history-action/src/main/java/com/weaver/seconddev/service/InHrmResource.java new file mode 100644 index 0000000..4bcba42 --- /dev/null +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/service/InHrmResource.java @@ -0,0 +1,29 @@ +package com.weaver.seconddev.service; + +import com.weaver.seconddev.service.entity.HrmResourceReq; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service("InHrmResource") +public class InHrmResource { + + + private static final Logger logger = LoggerFactory.getLogger(InHrmResource.class); + + + @Autowired + private HrmResourceReq hrmResourceReq; + + + public String inHrmResource(String param){ + //实现自定义webservice接口逻辑 + + logger.info("InHrmResource webservice param = " + param); + + return "request success"; + } + + +} diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/service/entity/HrmResource.java b/secondev-history-action/src/main/java/com/weaver/seconddev/service/entity/HrmResource.java new file mode 100644 index 0000000..8dc7ee2 --- /dev/null +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/service/entity/HrmResource.java @@ -0,0 +1,293 @@ +package com.weaver.seconddev.service.entity; + +public class HrmResource { + String uid = "";// workcode + String cn = "";// lastname + String password = "";// password(MD5加密) + String accountstatus = "";// loginid(默认为工号) + String guid = "";// textfield1 + String companyid = "";// subcompanyid1 + String departmentid = "";// departmentid + String postid = "";// jobtitle + String sex = "";// sex + String highlevel = "";// manager + String employeestatus = "";// status + String birthday = "";// birthday + String nativeplace = "";// nativeplace + String politicalstatus = "";// policy + String domicile = "";// residentplace + String mobile = "";// mobile + String graduatedfrom = "";// textfield4 + String education = "";// textfield3 + String major = "";// textfield5 + String startpostdate = "";// datefield2 + String identitycard = "";// certificatenum + String enterhtdate = "";// datefield1 + String cardnumber = "";// textfield2 + String wordtel = "";// telephone + String joblevel = "";// joblevel + String permanentaddress = "";// homeaddress + String maritalstatus = "";// maritalstatus + String mail = "";// email + String operation = ""; // 操作 + + String companyguid = "";// cmpguid + String departmentguid = "";// deptguid + String postguid = "";// postgudi + + public String getUid() { + return uid; + } + + public void setUid(String uid) { + this.uid = uid; + } + + public String getCn() { + return cn; + } + + public void setCn(String cn) { + this.cn = cn; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getAccountstatus() { + return accountstatus; + } + + public void setAccountstatus(String accountstatus) { + this.accountstatus = accountstatus; + } + + public String getGuid() { + return guid; + } + + public void setGuid(String guid) { + this.guid = guid; + } + + public String getCompanyid() { + return companyid; + } + + public void setCompanyid(String companyid) { + this.companyid = companyid; + } + + public String getDepartmentid() { + return departmentid; + } + + public void setDepartmentid(String departmentid) { + this.departmentid = departmentid; + } + + public String getPostid() { + return postid; + } + + public void setPostid(String postid) { + this.postid = postid; + } + + public String getSex() { + return sex; + } + + public void setSex(String sex) { + this.sex = sex; + } + + public String getHighlevel() { + return highlevel; + } + + public void setHighlevel(String highlevel) { + this.highlevel = highlevel; + } + + public String getEmployeestatus() { + return employeestatus; + } + + public void setEmployeestatus(String employeestatus) { + this.employeestatus = employeestatus; + } + + public String getBirthday() { + return birthday; + } + + public void setBirthday(String birthday) { + this.birthday = birthday; + } + + public String getNativeplace() { + return nativeplace; + } + + public void setNativeplace(String nativeplace) { + this.nativeplace = nativeplace; + } + + public String getPoliticalstatus() { + return politicalstatus; + } + + public void setPoliticalstatus(String politicalstatus) { + this.politicalstatus = politicalstatus; + } + + public String getDomicile() { + return domicile; + } + + public void setDomicile(String domicile) { + this.domicile = domicile; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getGraduatedfrom() { + return graduatedfrom; + } + + public void setGraduatedfrom(String graduatedfrom) { + this.graduatedfrom = graduatedfrom; + } + + public String getEducation() { + return education; + } + + public void setEducation(String education) { + this.education = education; + } + + public String getMajor() { + return major; + } + + public void setMajor(String major) { + this.major = major; + } + + public String getStartpostdate() { + return startpostdate; + } + + public void setStartpostdate(String startpostdate) { + this.startpostdate = startpostdate; + } + + public String getIdentitycard() { + return identitycard; + } + + public void setIdentitycard(String identitycard) { + this.identitycard = identitycard; + } + + public String getEnterhtdate() { + return enterhtdate; + } + + public void setEnterhtdate(String enterhtdate) { + this.enterhtdate = enterhtdate; + } + + public String getCardnumber() { + return cardnumber; + } + + public void setCardnumber(String cardnumber) { + this.cardnumber = cardnumber; + } + + public String getWordtel() { + return wordtel; + } + + public void setWordtel(String wordtel) { + this.wordtel = wordtel; + } + + public String getJoblevel() { + return joblevel; + } + + public void setJoblevel(String joblevel) { + this.joblevel = joblevel; + } + + public String getPermanentaddress() { + return permanentaddress; + } + + public void setPermanentaddress(String permanentaddress) { + this.permanentaddress = permanentaddress; + } + + public String getMaritalstatus() { + return maritalstatus; + } + + public void setMaritalstatus(String maritalstatus) { + this.maritalstatus = maritalstatus; + } + + public String getMail() { + return mail; + } + + public void setMail(String mail) { + this.mail = mail; + } + + public String getOperation() { + return operation; + } + + public void setOperation(String operation) { + this.operation = operation; + } + + public String getCompanyguid() { + return companyguid; + } + + public void setCompanyguid(String companyguid) { + this.companyguid = companyguid; + } + + public String getDepartmentguid() { + return departmentguid; + } + + public void setDepartmentguid(String departmentguid) { + this.departmentguid = departmentguid; + } + + public String getPostguid() { + return postguid; + } + + public void setPostguid(String postguid) { + this.postguid = postguid; + } +} \ No newline at end of file diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/service/entity/HrmResourceReq.java b/secondev-history-action/src/main/java/com/weaver/seconddev/service/entity/HrmResourceReq.java new file mode 100644 index 0000000..af882c3 --- /dev/null +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/service/entity/HrmResourceReq.java @@ -0,0 +1,52 @@ +package com.weaver.seconddev.service.entity; + +import org.slf4j.LoggerFactory; + +public class HrmResourceReq { + + public static final org.slf4j.Logger logger_fe319dbb = LoggerFactory.getLogger(HrmResourceReq.class); + + // workcode + String SENDID = ""; + + // lastname + String ITFID = ""; + + // password(MD5加密) + String SYSID = ""; + + // hrmResource + HrmResource[] DATAS; + + public String getSENDID() { + return SENDID; + } + + public void setSENDID(String paramSENDID) { + this.SENDID = paramSENDID; + } + + public String getITFID() { + return ITFID; + } + + public void setITFID(String paramITFID) { + this.ITFID = paramITFID; + } + + public String getSYSID() { + return SYSID; + } + + public void setSYSID(String paramSYSID) { + this.SYSID = paramSYSID; + } + + public HrmResource[] getDATAS() { + return DATAS; + } + + public void setDATAS(HrmResource[] paramDATAS) { + this.DATAS = paramDATAS; + } +}