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

info

Browse Source
ht
qijirenjian 4 months ago
parent 20db0e581f
commit 7059294f5e
6 changed files with 109 additions and 25 deletions
Show Stats Download Patch File Download Diff File

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

@ -85,12 +85,12 @@ public class EAS_DZDAApproveAction extends BaseBean implements Action, EsbServer
BillFieldUtil unit = new BillFieldUtil();
Property[] properties = requestInfo.getMainTableInfo().getProperty();
requestID = requestInfo.getRequestid();
logger_3f787449.info(String.valueOf("EAS_DZDAApproveAction--start--" + requestID));
logger_3f787449.error(String.valueOf("EAS_DZDAApproveAction--start--" + requestID));
String lastopertorid = requestInfo.getLastoperator();
approvalBy = unit.getWorkcode(lastopertorid);
logger_3f787449.info(String.valueOf("--lastoperatorid--" + lastopertorid + "||approvalBy=" + approvalBy));
logger_3f787449.error(String.valueOf("--lastoperatorid--" + lastopertorid + "||approvalBy=" + approvalBy));
approvalDate = getCurrentDate();
logger_3f787449.info(String.valueOf("--approvalDate--" + approvalDate));
logger_3f787449.error(String.valueOf("--approvalDate--" + approvalDate));
Map<String, String> mMap = new HashMap<String, String>();
for (int i = 0; i < properties.length; i++) {
String name = properties[i].getName().toUpperCase();
@ -98,12 +98,12 @@ public class EAS_DZDAApproveAction extends BaseBean implements Action, EsbServer
mMap.put(name, value);
}
approvalStatus = mMap.get("STATUS");
logger_3f787449.info(String.valueOf("审批状态：" + approvalStatus));
logger_3f787449.error(String.valueOf("审批状态：" + approvalStatus));
if (approvalStatus == null || approvalStatus.equals("")) {
return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestInfo.getRequestManager()));
}
revisedPlanReturnDate = mMap.get("YJGHRQ");
logger_3f787449.info(String.valueOf("计划归还日期：" + revisedPlanReturnDate));
logger_3f787449.error(String.valueOf("计划归还日期：" + revisedPlanReturnDate));
if (revisedPlanReturnDate != null && !revisedPlanReturnDate.equals("")) {
revisedPlanReturnDate = revisedPlanReturnDate.replaceAll("-", "");
}
@ -124,7 +124,7 @@ public class EAS_DZDAApproveAction extends BaseBean implements Action, EsbServer
mJson.put("approvalDate", approvalDate);
String errorMsg = "";
if ("Y".equals(approvalStatus)) {
logger_3f787449.info(String.valueOf("明细表开始取值"));
logger_3f787449.error(String.valueOf("明细表开始取值"));
DetailTable[] detailtable = requestInfo.getDetailTableInfo().getDetailTable();
// ===========凭证明细==============//
DetailTable dtq = detailtable[0];
@ -162,38 +162,38 @@ public class EAS_DZDAApproveAction extends BaseBean implements Action, EsbServer
receiptVOListArr.add(item);
}
mJson.put("receiptVOList", receiptVOListArr);
logger_3f787449.info(String.valueOf("获取明细表数据结束"));
logger_3f787449.error(String.valueOf("获取明细表数据结束"));
}
logger_3f787449.info("调用借阅审批回调接口请求数据：=====" + mJson.toString());
logger_3f787449.error("调用借阅审批回调接口请求数据：=====" + mJson.toString());
// 调用接口
// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("hteasoasync.uploadDZDAApprovelUrl")).trim();
String url = configProp.getUploadZZInfoUrl();
ZZ_SendPostRequest mGetResult = new ZZ_SendPostRequest();
String result = mGetResult.getResult(mJson, url);
logger_3f787449.info(String.valueOf("调用借阅审批回调接口返回值：" + result));
logger_3f787449.error(String.valueOf("调用借阅审批回调接口返回值：" + result));
if (!"E".equals(result)) {
JSONObject jsonObject = JSONObject.parseObject(result);
// 接口处理状态 S-成功，F-失败
String isTat = jsonObject.getString("status");
// 处理消息
String srMessage = jsonObject.getString("message");
logger_3f787449.info("报账系统返回数据：" + jsonObject.toString());
logger_3f787449.error("报账系统返回数据：" + jsonObject.toString());
if (!"S".equals(isTat)) {
// 失败
logger_3f787449.info(String.valueOf("报账系统返回错误信息：" + srMessage));
logger_3f787449.error(String.valueOf("报账系统返回错误信息：" + srMessage));
// requestInfo.getRequestManager().setMessageid("ERROR");
requestInfo.getRequestManager().setMessagecontent("报账系统返回错误信息：" + srMessage);
return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", FAILURE_AND_CONTINUE, requestInfo.getRequestManager()));
}
} else {
logger_3f787449.info(String.valueOf("调用借阅审批回调接口返回失败，请联系报账系统管理员！"));
logger_3f787449.error(String.valueOf("调用借阅审批回调接口返回失败，请联系报账系统管理员！"));
// requestInfo.getRequestManager().setMessageid("ERROR");
requestInfo.getRequestManager().setMessagecontent("调用借阅审批回调接口返回失败，请联系报账系统管理员！");
return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", FAILURE_AND_CONTINUE, requestInfo.getRequestManager()));
}
} catch (Exception e) {
logger_3f787449.info(String.valueOf("提交失败！"));
logger_3f787449.info(String.valueOf("Error======" + e.getMessage()));
logger_3f787449.error(String.valueOf("提交失败！"));
logger_3f787449.error(String.valueOf("Error======" + e.getMessage()));
// requestInfo.getRequestManager().setMessageid("ERROR");
requestInfo.getRequestManager().setMessagecontent("提交失败！");
return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", FAILURE_AND_CONTINUE, requestInfo.getRequestManager()));

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

@ -77,7 +77,7 @@ public class ZZ_Ten_GDFileUploadAction extends BaseBean implements Action, EsbSe
// 接口密码
// String PASSWORD = "efs2@2@@9!@HT";
String PASSWORD = "efs2@2@@9!@HT";
String PASSWORD = "abc,,,123";
// 业务属性 6-总账
String businessTag = "6";
// //业务类型 1: 费用类 2; 采购类---1,2是针对报账系统的

2
secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/DiscountApplicationService.java
Unescape Escape View File

@ -48,7 +48,7 @@ public class DiscountApplicationService {
String creator = "";
String companycode = param.getCompanyCode();
RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
rs.executeSql("select oafqrgh from uf_applyUser where companycode='"+companycode+"' and lclx=0", CONN_TYPE.ebuilder.getType());
rs.executeSql("select oafqrgh from uf_applyUser where companycode='"+companycode+"' and lclx=1", CONN_TYPE.ebuilder.getType());
if(rs.next()){
creator = Util.null2String(rs.getString("oafqrgh"));
}

18
secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/WLPS_SY_GetResService.java
Unescape Escape View File

@ -26,7 +26,7 @@ public class WLPS_SY_GetResService {
private final static Logger log = LoggerFactory.getLogger(WLPS_SY_GetResService.class);
public void getRes(WLPS_SY_Response res) {
log.error("接收MesWLPS_SY接口返回值开始");
log.error("接收MesWLPS_SY接口返回值开始 : res = " + res.toString());
String isTat = res.getISTAT();
String systemId = res.getSYSID();
RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
@ -39,18 +39,22 @@ public class WLPS_SY_GetResService {
String workflowid = ret[i].getWorkflowid();
WfUtil wfUtil = new WfUtil();
// Map<String, String> zhWfMap = wfUtil.getZhWfMap("t6kj9c07jr", creator, workflowid);
Map<String, String> zhWfMap = wfUtil.getZhWfMapNoUser("t6kj9c07jr", workflowid);
//
// String workflowId = zhWfMap.get("workflowid");
// log.error("转换后的流程ID:"+workflowId);
workflowid = zhWfMap.get("workflowid");
log.error("转换后的流程ID:"+workflowid);
String tablename = SecondUtil.getTableName(workflowid);
String requestid = ret[i].getRequestId();
String state = ret[i].getIstat();
String message = ret[i].getMessage();
if(!"".equals(workflowid)&&!"".equals(requestid)&&workflowid.equals(SecondUtil.getWorkflowIdByReq(requestid))){
String sql = "update "+tablename+" set state='"+state+"',message='"+message+"' where requestId="+requestid;
rs.executeSql(sql,poolname);
log.error(systemId+"--"+requestid+"更新成功");
String dataid = SecondUtil.getidByrequestid(requestid);
String sql = "update e10_core_business.dbo."+tablename+" set state='"+state+"',message='"+message+"' where id="+dataid;
log.error( "sql" + sql);
boolean b1 = rs.executeSql(sql, poolname);
log.error(systemId+"--"+requestid+"更新成功" + b1);
}else{
log.error("MesWLPS_SY返回数据不符合要求"+res);
}

23
secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/util/SecondUtil.java
Unescape Escape View File

@ -263,11 +263,13 @@ public class SecondUtil {
String tableName = "";
String sql = "select table_name from e10_core_business.dbo.form_table where \n" +
" form_id = (select relatekey from e10_core_business.dbo.wfp_relateform where workflowid = '"+workflowId+"')";
log.error(" SecondUtil getTableName sql " + sql);
rs.executeSql(sql,poolname);
while (rs.next()){
tableName = Util.null2String(rs.getString("table_name"));
}
log.error(" SecondUtil tableName " + tableName);
return tableName;
}
@ -282,14 +284,31 @@ public class SecondUtil {
String workflowId = "";
String sql = "select workflowid from e10_core_business.dbo.wfc_form_data where requestid = '"+requestId+"'\n" +
" and delete_type = 0";
log.error(" SecondUtil getWorkflowIdByReq sql " + sql);
rs.executeSql(sql,poolname);
if (rs.next()){
workflowId = Util.null2String(rs.getString("workflowid"));
}
log.error(" SecondUtil workflowId " + workflowId);
return workflowId;
}
public static 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 = Util.null2String(rs.getString("dataid"));
}
log.error(" SecondUtil dataid " + dataid);
return dataid;
}
public static String getMeetingInfo(String loginname,String password,String companyIds,String startdate,String enddate) {

61
secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/util/WfUtil.java
Unescape Escape View File

@ -88,6 +88,67 @@ public class WfUtil {
return map;
}
public Map<String,String> getZhWfMapNoUser(String jtzhTenantKey,String wfid){
log.error("getZhWfMapNoUser start : " + wfid );
String currentWfid = wfid;//触发过来的wfid
String validWfif = "";//有效wfid
if(currentWfid.length()<=8){
currentWfid = getStrNum(currentWfid,8);
}
RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
String poolname = CONN_TYPE.ebuilder.getType();
rs.setTenantKey(jtzhTenantKey);
//从集团租户 根据传入的wfid获取有效的wfid
validWfif = getValidWfid(jtzhTenantKey,currentWfid);
log.error("getZhWfMapNoUser validWfif : " + validWfif );
if("".equals(validWfif)){//如果为空就是其他租户的新流程
validWfif = currentWfid;
}
//根据传入的wfid和获取到的当前有效的wfid 从配置表获取对应租户和对应wfid
String sszh = "";//所属租户
String jtwfid = "";//集团wfid
String gdwfid = "";//光电wfid
String hhwfid = "";//华海wfid
String workflowid = "";
String sql = "select sszh,jtwfid,gdwfid,hhwfid from e10_common.dbo.uf_zhwfid_mt where (cfwfid like '%"+currentWfid+"' or cfwfid like '%"+validWfif+"') and delete_type ='0'";
rs.executeSql(sql,poolname);
if(rs.next()){
sszh = Util.null2String(rs.getString("sszh"));
jtwfid = Util.null2String(rs.getString("jtwfid"));
gdwfid = Util.null2String(rs.getString("gdwfid"));
hhwfid = Util.null2String(rs.getString("hhwfid"));
}
log.error("getZhWfMapNoUser sszh : " + sszh );
String tenantKey = "";
// if("3".equals(sszh)){//全租户 判断创建人是哪个租户的 取对应租户的 wfid;
// String zhbs = getZhbs(workcode,jtzhTenantKey);
// sszh = getZhbsInfo(zhbs,jtzhTenantKey);
// }
if("0".equals(sszh)){//集团
workflowid =jtwfid;
tenantKey = getZhTenantKey(sszh,jtzhTenantKey);
}else if("1".equals(sszh)){//光电
workflowid =gdwfid;
tenantKey = getZhTenantKey(sszh,jtzhTenantKey);
}else if("2".equals(sszh)){//华海租户
workflowid = hhwfid;
tenantKey = getZhTenantKey(sszh,jtzhTenantKey);
}
log.error("getZhWfMapNoUser workflowid : " + workflowid );
if("".equals(workflowid)){
workflowid = validWfif;
tenantKey = jtzhTenantKey;
}
validWfif = getValidWfid(tenantKey,workflowid);
Map<String,String> map = new HashMap<>();
map.put("workflowid",validWfif);
map.put("tenantKey",tenantKey);
log.error("map : " + map );
return map;
}
public String getZhbs(String workcode,String jtzhTenantKey){
RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
String poolname = CONN_TYPE.hrm.getType();

Write Preview
Loading…
Cancel
Save