rj
/
ht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ht' into ht

Browse Source
ht
calyrex 3 months ago
parent 31a3319469 63fe22d9be
commit 9d7195c2d8
6 changed files with 45 additions and 21 deletions
Show Stats Download Patch File Download Diff File

0
secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/oames/CallMesWLPS_SYService.java
Unescape Escape View File

4
secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java
Unescape Escape View File

@ -130,8 +130,10 @@ 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());
logger_c29b3679.error(" newoperate " + obj.get("OPERATETYPE"));
HttpClient client = new DefaultHttpClient();
// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htcrmoasync.CreateBilling")).trim();

0
secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/Action20210802092416.java
Unescape Escape View File

23
secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorAdmitAction.java
Unescape Escape View File

@ -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();
dlvapplyin.setRequestId(Integer.parseInt(requestid));
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,6 +195,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<String, Object> getResultMapForAction(Map<String, Object> map, String key, Object value, RequestManager requestManager) {
if (key != null && !key.isEmpty()) {
map.put(key, value);
@ -207,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)));
// }
}

30
secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateSecLevelAndLockStatus.java
Unescape Escape View File

@ -39,22 +39,24 @@ public class UpdateSecLevelAndLockStatus implements EsbServerlessRpcRemoteInterf
* @return
*/
public WeaResult<Map<String, Object>> execute(Map<String, Object> 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<String, String> result = new HashMap<String, String>();
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));
}
}

9
secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/YongGongXuQiuAction.java
Unescape Escape View File

@ -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);
@ -214,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()));
}

Write Preview
Loading…
Cancel
Save