From 29826508fe0b9633ce32b5a1a89259773111666a Mon Sep 17 00:00:00 2001 From: qijirenjian Date: Wed, 19 Mar 2025 15:46:18 +0800 Subject: [PATCH] config --- .../interfaces/easoa/CallEasServices.java | 30 ++++++---- .../easoa/CallTravelApplyService.java | 6 +- .../action/ChuChaiShenQingNewAction.java | 5 +- .../workflow/action/EasWhiteListAction.java | 10 +++- .../action/ISO_FileAddOrReviseAction.java | 4 +- .../action/ISO_FilePermissionAction.java | 4 +- .../action/OaSrmCheckPriceApproveAction.java | 5 +- .../action/OaSrmCheckPriceRefuseAction.java | 5 +- .../ZOA_MM_PR_CREATE_YFFY_ZjAction.java | 5 +- .../action/ZOA_MM_PR_RELEASEAction.java | 4 +- .../workflow/action/ZOA_SL_GNCC_Action.java | 5 +- .../workflow/action/ZOA_SL_GWCC_Action.java | 4 +- .../workflow/util/CommonDevUtil.java | 15 +++++ .../njwebservice/OutToDoWorkflowService.java | 57 ++++++++++++------- .../njwebservice/WLPS_SY_GetResService.java | 2 +- 15 files changed, 110 insertions(+), 51 deletions(-) diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/CallEasServices.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/CallEasServices.java index 9b2423f..c4cf14f 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/CallEasServices.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/CallEasServices.java @@ -48,8 +48,10 @@ public class CallEasServices { easStub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); easStub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); HttpTransportPropertiesImpl.Authenticator auth = new HttpTransportPropertiesImpl.Authenticator(); - auth.setUsername("pouser"); - auth.setPassword("654321"); +// auth.setUsername("pouser"); +// auth.setPassword("654321"); + auth.setUsername(configProp.getPo_user()); + auth.setPassword(configProp.getPo_password()); // HttpTransportProperties.Authenticator auth = new HttpTransportProperties.Authenticator(); // auth.setUsername("pouser"); // auth.setPassword("654321"); @@ -89,8 +91,10 @@ public class CallEasServices { easStub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); easStub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); HttpTransportPropertiesImpl.Authenticator auth = new HttpTransportPropertiesImpl.Authenticator(); - auth.setUsername("pouser"); - auth.setPassword("654321"); +// auth.setUsername("pouser"); +// auth.setPassword("654321"); + auth.setUsername(configProp.getPo_user()); + auth.setPassword(configProp.getPo_password()); easStub._getServiceClient().getOptions().setProperty(org.apache.axis2.kernel.http.HTTPConstants.AUTHENTICATE,auth); PayControlServiceStub.QueryVendorInfoList list = new PayControlServiceStub.QueryVendorInfoList(); list.setVendorCode(""); @@ -126,8 +130,10 @@ public class CallEasServices { easStub = new PayControlServiceStub(url); easStub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); HttpTransportPropertiesImpl.Authenticator auth = new HttpTransportPropertiesImpl.Authenticator(); - auth.setUsername("pouser"); - auth.setPassword("654321"); +// auth.setUsername("pouser"); +// auth.setPassword("654321"); + auth.setUsername(configProp.getPo_user()); + auth.setPassword(configProp.getPo_password()); easStub._getServiceClient().getOptions().setProperty(org.apache.axis2.kernel.http.HTTPConstants.AUTHENTICATE,auth); PayControlServiceStub.CheckBoeNumParamInfo paraminfo = new PayControlServiceStub.CheckBoeNumParamInfo(); paraminfo.setSourceBoeNum(bzdh); @@ -191,8 +197,10 @@ public class CallEasServices { easStub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); easStub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); HttpTransportPropertiesImpl.Authenticator auth = new HttpTransportPropertiesImpl.Authenticator(); - auth.setUsername("pouser"); - auth.setPassword("654321"); +// auth.setUsername("pouser"); +// auth.setPassword("654321"); + auth.setUsername(configProp.getPo_user()); + auth.setPassword(configProp.getPo_password()); easStub._getServiceClient().getOptions().setProperty(org.apache.axis2.kernel.http.HTTPConstants.AUTHENTICATE,auth); int num = 0; if (gysid != null) { @@ -275,8 +283,10 @@ public class CallEasServices { easStub = new PayControlServiceStub(url); easStub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); HttpTransportPropertiesImpl.Authenticator auth = new HttpTransportPropertiesImpl.Authenticator(); - auth.setUsername("pouser"); - auth.setPassword("654321"); +// auth.setUsername("pouser"); +// auth.setPassword("654321"); + auth.setUsername(configProp.getPo_user()); + auth.setPassword(configProp.getPo_password()); easStub._getServiceClient().getOptions().setProperty(org.apache.axis2.kernel.http.HTTPConstants.AUTHENTICATE,auth); PayControlServiceStub.CheckStatusParam param = new PayControlServiceStub.CheckStatusParam(); param.setCheckType(type); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/CallTravelApplyService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/CallTravelApplyService.java index 8a8cebb..2a59f0e 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/CallTravelApplyService.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/CallTravelApplyService.java @@ -40,8 +40,10 @@ public class CallTravelApplyService { stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); HttpTransportPropertiesImpl.Authenticator auth = new HttpTransportPropertiesImpl.Authenticator(); - auth.setUsername("pouser"); - auth.setPassword("654321"); +// auth.setUsername("pouser"); +// auth.setPassword("654321"); + auth.setUsername(configProp.getPo_user()); + auth.setPassword(configProp.getPo_password()); stub._getServiceClient().getOptions().setProperty(org.apache.axis2.kernel.http.HTTPConstants.AUTHENTICATE,auth); SI_BusinessTripApplicationSync_OUTServiceStub.SyncTravelApplyServiceResponse response = stub.sI_BusinessTripApplicationSync_OUT(input); SI_BusinessTripApplicationSync_OUTServiceStub.ResultInfo resultInfo = response.get_return(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChuChaiShenQingNewAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChuChaiShenQingNewAction.java index a77724a..403d9a7 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChuChaiShenQingNewAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChuChaiShenQingNewAction.java @@ -50,7 +50,8 @@ public class ChuChaiShenQingNewAction extends BaseBean implements Action, EsbSer // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private LogUtil logUtil; private static final Logger logger_fee0cda9 = LoggerFactory.getLogger(ChuChaiShenQingNewAction.class); @Autowired @@ -148,7 +149,7 @@ public class ChuChaiShenQingNewAction extends BaseBean implements Action, EsbSer // ChuChaiShenQing po = new ChuChaiShenQing(); // String str = po.Getexecute(requestid,GH,QJLB,beginDateTime,endDateTime,QJSS); // /推送E-HR - LogUtil logUtil = new LogUtil(); +// LogUtil logUtil = new LogUtil(); logUtil.setJklm("ChuChaiShenQingNewAction"); logUtil.setLx("1"); logUtil.setBt(requestname); 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 903e177..23b6651 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,5 +1,6 @@ package com.weaver.seconddev.interfaces.workflow.action; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import org.apache.axis2.kernel.http.HTTPConstants; import org.apache.axis2.transport.http.HttpTransportProperties; import com.weaver.seconddev.interfaces.easoa.SI_WhitelistSync_OUTServiceStub; @@ -31,7 +32,8 @@ public class EasWhiteListAction extends BaseBean implements Action, EsbServerles // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private ConfigProp configProp; private static final Logger logger_b5430ca5 = LoggerFactory.getLogger(EasWhiteListAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -177,8 +179,10 @@ public class EasWhiteListAction extends BaseBean implements Action, EsbServerles stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); // HttpTransportProperties.Authenticator auth = new HttpTransportProperties.Authenticator(); HttpTransportPropertiesImpl.Authenticator auth = new HttpTransportPropertiesImpl.Authenticator(); - auth.setUsername("pouser"); - auth.setPassword("654321"); +// auth.setUsername("pouser"); +// auth.setPassword("654321"); + auth.setUsername(configProp.getPo_user()); + auth.setPassword(configProp.getPo_password()); stub._getServiceClient().getOptions().setProperty(org.apache.axis2.kernel.http.HTTPConstants.AUTHENTICATE,auth); SI_WhitelistSync_OUTServiceStub.SyncWhiteListServiceResponse response = stub.sI_WhitelistSync_OUT(input); SI_WhitelistSync_OUTServiceStub.ResultInfo resultInfo = response.get_return(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_FileAddOrReviseAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_FileAddOrReviseAction.java index faf6996..74e2f7a 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_FileAddOrReviseAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_FileAddOrReviseAction.java @@ -49,6 +49,8 @@ public class ISO_FileAddOrReviseAction extends BaseBean implements Action, EsbSe private RequestInfo requestInfoTemp; @Autowired private ConfigProp configProp; + @Autowired + private LogUtil logUtil; private static final Logger logger_cb97befd = LoggerFactory.getLogger(ISO_FileAddOrReviseAction.class); @Override @@ -65,7 +67,7 @@ public class ISO_FileAddOrReviseAction extends BaseBean implements Action, EsbSe // 获取工作流程Workflowid的值 String workflowID = requestInfo.getWorkflowid(); String requestName = requestInfo.getRequestManager().getRequestname(); - LogUtil logUtil = new LogUtil(); +// LogUtil logUtil = new LogUtil(); try { ResourceComInfo hr = I18nContextUtil.getBean(ResourceComInfo.class); BillFieldUtil unit = new BillFieldUtil(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_FilePermissionAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_FilePermissionAction.java index e02cc95..43f3053 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_FilePermissionAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_FilePermissionAction.java @@ -49,6 +49,8 @@ public class ISO_FilePermissionAction extends BaseBean implements Action, EsbSer private RequestInfo requestInfoTemp; @Autowired private ConfigProp configProp; + @Autowired + private LogUtil logUtil; private static final Logger logger_8728ce5a = LoggerFactory.getLogger(ISO_FilePermissionAction.class); @Override @@ -65,7 +67,7 @@ public class ISO_FilePermissionAction extends BaseBean implements Action, EsbSer // 获取工作流程Workflowid的值 String workflowID = requestInfo.getWorkflowid(); String requestName = requestInfo.getRequestManager().getRequestname(); - LogUtil logUtil = new LogUtil(); +// LogUtil logUtil = new LogUtil(); try { ResourceComInfo hr = I18nContextUtil.getBean(ResourceComInfo.class); BillFieldUtil unit = new BillFieldUtil(); 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 2358932..38652d2 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 @@ -43,7 +43,8 @@ public class OaSrmCheckPriceApproveAction extends BaseBean implements Action, Es // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private LogUtil logUtil; @Autowired private CallSrmCheckPriceServices srm; private static final Logger logger_c6c5cea5 = LoggerFactory.getLogger(OaSrmCheckPriceApproveAction.class); @@ -55,7 +56,7 @@ public class OaSrmCheckPriceApproveAction extends BaseBean implements Action, Es Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1))); RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); try { - LogUtil logUtil = new LogUtil(); +// LogUtil logUtil = new LogUtil(); String requestId = ""; try { int reqid = 0; 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 8bb4c30..66bacb0 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 @@ -45,7 +45,8 @@ public class OaSrmCheckPriceRefuseAction extends BaseBean implements Action, Esb private RequestInfo requestInfoTemp; @Autowired private CallSrmCheckPriceServices srm; - + @Autowired + private LogUtil logUtil; private static final Logger logger_80563c68 = LoggerFactory.getLogger(OaSrmCheckPriceRefuseAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -55,7 +56,7 @@ public class OaSrmCheckPriceRefuseAction extends BaseBean implements Action, Esb Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1))); RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); try { - LogUtil logUtil = new LogUtil(); +// LogUtil logUtil = new LogUtil(); String requestId = ""; try { int reqid = 0; 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 e821178..555e05d 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 @@ -51,7 +51,8 @@ public class ZOA_MM_PR_CREATE_YFFY_ZjAction extends BaseBean implements Action, // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private LogUtil logUtil; private static final Logger logger_adb00a32 = LoggerFactory.getLogger(ZOA_MM_PR_CREATE_YFFY_ZjAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -65,7 +66,7 @@ public class ZOA_MM_PR_CREATE_YFFY_ZjAction extends BaseBean implements Action, String reid = request.getRequestid(); String workflowid = request.getWorkflowid(); String requestName = request.getRequestManager().getRequestname(); - LogUtil logUtil = new LogUtil(); +// LogUtil logUtil = new LogUtil(); logUtil.setJklm("ZOA_MM_PR_CREATE_YFFY_ZjAction"); logUtil.setLx("1"); logUtil.setBt(requestName); 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 619d2be..9af171e 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 @@ -71,7 +71,9 @@ public class ZOA_MM_PR_RELEASEAction extends BaseBean implements Action, EsbServ String id = ""; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - String sql1 = "select top 1 id from e10_core_business.dbo." + tablename + " where id = " + requestId; + + String dataid = commonDevUtil.getidByrequestid(requestId); + String sql1 = "select top 1 id from e10_core_business.dbo." + tablename + " where FORM_DATA_ID = " + dataid; logger_41a94d2d.error("sql1 -----" + sql1); boolean b = recordset.executeSql(sql1, poolname); logger_41a94d2d.error("b -----" + b); 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 a87d4d6..17ac637 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 @@ -61,7 +61,8 @@ public class ZOA_SL_GNCC_Action extends BaseBean implements Action, EsbServerles private RequestInfo requestInfoTemp; @Autowired private ConfigProp configProp; - + @Autowired + private LogUtil logUtil; @Autowired private CallTravelApplyService callTravelApply; @@ -355,7 +356,7 @@ public class ZOA_SL_GNCC_Action extends BaseBean implements Action, EsbServerles // 推送E-HR // ChuChaiShenQing po = new ChuChaiShenQing(); // po.Getexecute(reid, errandEmpNum, "A11", beginDateTime, endDateTime, qjss); - LogUtil logUtil = new LogUtil(); +// LogUtil logUtil = new LogUtil(); logUtil.setJklm("ZOA_SL_GNCC_Action"); logUtil.setLx("1"); logUtil.setBt(requestname); 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 32014e6..3717383 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 @@ -63,6 +63,8 @@ public class ZOA_SL_GWCC_Action extends BaseBean implements Action, EsbServerles @Autowired private ConfigProp configProp; + @Autowired + private LogUtil logUtil; @Autowired private OaCtrip oactrip ; @Autowired @@ -341,7 +343,7 @@ public class ZOA_SL_GWCC_Action extends BaseBean implements Action, EsbServerles System.err.println(e.toString()); } // ChuChaiShenQing po = new ChuChaiShenQing(); - LogUtil logUtil = new LogUtil(); +// LogUtil logUtil = new LogUtil(); logUtil.setJklm("ZOA_SL_GWCC_Action"); logUtil.setLx("1"); logUtil.setBt(requestname); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/util/CommonDevUtil.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/util/CommonDevUtil.java index e3180dc..2acf08f 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/util/CommonDevUtil.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/util/CommonDevUtil.java @@ -36,4 +36,19 @@ public class CommonDevUtil { return tableName; } + public String getidByrequestid(String requestId) { + RecordSet rs = I18nContextUtil.getBean(RecordSet.class); + String poolname = CONN_TYPE.workflow.getType(); + String dataid = ""; + String sql = "select workflowid,dataid from e10_core_business.dbo.wfc_form_data where requestid = '"+requestId+"'\n" + + " and delete_type = 0"; +// log.error(" SecondUtil getidByrequestid sql " + sql); + rs.executeSql(sql,poolname); + if (rs.next()){ + dataid = com.weaver.common.hrm.util.Util.null2String(rs.getString("dataid")); + } +// log.error(" SecondUtil dataid " + dataid); + return dataid; + } + } diff --git a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/OutToDoWorkflowService.java b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/OutToDoWorkflowService.java index 58e9f97..fcd6ef7 100644 --- a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/OutToDoWorkflowService.java +++ b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/OutToDoWorkflowService.java @@ -58,17 +58,13 @@ public class OutToDoWorkflowService { public String outToDoWorkflowCount(ToDoCountReq param) { - log.error("outToDoWorkflowCount入参:"+param); -// ToDoCountReq param = JSON.parseObject(json, ToDoCountReq.class); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.hrm.getType(); String sql = "select ID from eteams.employee where status = 'normal' and job_num = '"+param.getWorkcode()+"'"; rs.executeSql(sql,poolname); if (rs.next()){ Long userId = Util.getLongValue(rs.getString("id")); - log.error("outToDoWorkflowCount userId:"+userId); int toDoWorkflowRequestCount = workflowService.getToDoWorkflowRequestCount(userId, param.getConditions()); - log.error("待办数量："+toDoWorkflowRequestCount); return String.valueOf(toDoWorkflowRequestCount); }else { return "未找到该用户"; @@ -76,15 +72,9 @@ public class OutToDoWorkflowService { } public ToDoRequestRes outToDoWorkflowList(ToDoRequestReq param) { -// String pc_url = Util.null2String(this.getPropValue("htportaloaUrl", "pc_url")).trim(); -// String mobile_url = Util.null2String(this.getPropValue("htportaloaUrl", "mobile_url")).trim(); - - log.error("outToDoWorkflowList入参:"+param); -// ToDoRequestReq param = JSON.parseObject(json, ToDoRequestReq.class); String jtzhkey = configProp.getJtzhkey(); String jtzhadmin = configProp.getJtzhadmin(); - log.error("jtzhkey:"+jtzhkey+" jtzhadmin:"+jtzhadmin); TenantRpcContext.setTargetTenantKey(jtzhkey); TenantRpcContext.setTargetEmployeeId(jtzhadmin); @@ -101,12 +91,10 @@ public class OutToDoWorkflowService { } else { param.setWorkcode(Util.null2String(rs.getString("id"))); Long userId = Util.getLongValue(rs.getString("id")); - log.error("用户id:"+userId); OutToDoWorkflowService outToDoWorkflowService = I18nContextUtil.getBean(OutToDoWorkflowService.class); WorkflowRequestInfo[] info = outToDoWorkflowService.getWorkflowRequestListByType(Integer.parseInt(param.getPageNo()), Integer.parseInt(param.getPageSize()), Integer.parseInt(param.getRecordCount()), userId, param.getConditions(),"todo",jtzhkey); - log.error("info:"+ JSONArray.toJSONString(info)); res.setMsg("find:" + info.length); ToDoWorkFlow[] todo = new ToDoWorkFlow[info.length]; @@ -122,10 +110,39 @@ public class OutToDoWorkflowService { wftodo.requestId = Util.null2String(info[i].getRequestId()); wftodo.requestLevel = Util.null2String(info[i].getRequestLevel()); wftodo.requestName = Util.null2String(info[i].getRequestName()); - wftodo.workflowId = Util.null2String(info[i].getWorkflowBaseInfo().getWorkflowId()); - wftodo.workflowName = Util.null2String(info[i].getWorkflowBaseInfo().getWorkflowName()); - wftodo.workflowTypeId = Util.null2String(info[i].getWorkflowBaseInfo().getWorkflowTypeId()); - wftodo.workflowTypeName = Util.null2String(info[i].getWorkflowBaseInfo().getWorkflowTypeName()); + + String workflowId = Util.null2String(info[i].getWorkflowBaseInfo().getWorkflowId()); + String workflowName = ""; + if(StringUtils.isNotEmpty(workflowId)){ + wftodo.workflowId = workflowId; + sql = "select workflowname from e10_core_business.dbo.wfp_base where id = 100003460000008174"; + rs.executeQuery(sql); + if(rs.next()){ + workflowName = rs.getString("workflowname"); + } + wftodo.workflowName = workflowName; + }else{ + wftodo.workflowId = Util.null2String(info[i].getWorkflowBaseInfo().getWorkflowId()); + wftodo.workflowName = Util.null2String(info[i].getWorkflowBaseInfo().getWorkflowName()); + } + + + String workflowTypeId= Util.null2String(info[i].getWorkflowBaseInfo().getWorkflowTypeId()); + String workflowTypeName = ""; + if(StringUtils.isNotEmpty(workflowTypeId)){ + wftodo.workflowTypeId = workflowTypeId; + sql = "select typename from e10_core_business.dbo.wfp_type where id = " + workflowTypeId; + rs.executeQuery(sql); + if(rs.next()){ + workflowTypeName = rs.getString("typename"); + } + wftodo.workflowTypeName = workflowTypeName; + }else{ + wftodo.workflowTypeId = Util.null2String(info[i].getWorkflowBaseInfo().getWorkflowTypeId()); + wftodo.workflowTypeName = Util.null2String(info[i].getWorkflowBaseInfo().getWorkflowTypeName()); + } + + wftodo.mobileurl = mobile_url + configProp.getHtportaloaUrl_pc_url() +"/mobile/workflow/flowpage/view/"+ wftodo.requestId; wftodo.pcurl = pc_url + configProp.getHtportaloaUrl_pc_url() +"/sp/workflow/flowpage/fullView/"+ wftodo.requestId; todo[i] = wftodo; @@ -140,9 +157,7 @@ public class OutToDoWorkflowService { RecordSet recordSet=new RecordSet(); try { - log.error("userId = " + userId +" jtzhkey = " +jtzhkey); SimpleEmployee employee = hrmContextUtil.build(userId,jtzhkey); - log.error("employee id= " +employee.getId()); RequestListConditionApiEntity conditionEntity=new RequestListConditionApiEntity(); @@ -223,8 +238,7 @@ public class OutToDoWorkflowService { private String formatDate (String timeStr){ - log.error("outToDoWorkflowCount formatDate :"+ timeStr); - SimpleDateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS"); + SimpleDateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String output = ""; try { @@ -237,7 +251,8 @@ public class OutToDoWorkflowService { } catch (Exception e) { e.printStackTrace(); } - log.error("output :"+ output); + System.out.println("output :"+ output); return output; } + } diff --git a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/WLPS_SY_GetResService.java b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/WLPS_SY_GetResService.java index e789869..4e8bd29 100644 --- a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/WLPS_SY_GetResService.java +++ b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/WLPS_SY_GetResService.java @@ -51,7 +51,7 @@ public class WLPS_SY_GetResService { String message = ret[i].getMessage(); if(!"".equals(workflowid)&&!"".equals(requestid)&&workflowid.equals(SecondUtil.getWorkflowIdByReq(requestid))){ String dataid = SecondUtil.getidByrequestid(requestid); - String sql = "update e10_core_business.dbo."+tablename+" set state='"+state+"',message='"+message+"' where id="+dataid; + String sql = "update e10_core_business.dbo."+tablename+" set state='"+state+"',message='"+message+"' where FORM_DATA_ID="+dataid; log.error( "sql" + sql); boolean b1 = rs.executeSql(sql, poolname); log.error(systemId+"--"+requestid+"更新成功" + b1);