|
@@ -169,7 +169,7 @@ public class ApproveLogBusinessImpl implements IApproveLogBusiness {
|
|
break;
|
|
break;
|
|
case RECALL:
|
|
case RECALL:
|
|
//审批请求日志
|
|
//审批请求日志
|
|
- buildRequestLog(RequestDisposeTypeEnum.RECALL.getValue(), logDto, flowNodeCode, flowNodeName, taskKey, flowKey, processInstanceId);
|
|
|
|
|
|
+ buildRequestLog(RequestDisposeTypeEnum.RECALL.getValue(), logDto, flowNodeCode, flowNodeName, taskKey, flowKey, processInstanceId, "22");
|
|
break;
|
|
break;
|
|
default:
|
|
default:
|
|
break;
|
|
break;
|
|
@@ -187,7 +187,7 @@ public class ApproveLogBusinessImpl implements IApproveLogBusiness {
|
|
* @param flowKey 流程key
|
|
* @param flowKey 流程key
|
|
*/
|
|
*/
|
|
private void buildRequestLog(String disposeType, LogDto logDto, String flowNodeCode, String flowNodeName,
|
|
private void buildRequestLog(String disposeType, LogDto logDto, String flowNodeCode, String flowNodeName,
|
|
- String taskKey, String flowKey, String processInstanceId) {
|
|
|
|
|
|
+ String taskKey, String flowKey, String processInstanceId, String businessCode) {
|
|
|
|
|
|
ApprovalInfo approvalInfo = logDto.getApprovalInfo();
|
|
ApprovalInfo approvalInfo = logDto.getApprovalInfo();
|
|
RequestLog requestLog = new RequestLog();
|
|
RequestLog requestLog = new RequestLog();
|
|
@@ -219,7 +219,7 @@ public class ApproveLogBusinessImpl implements IApproveLogBusiness {
|
|
logInfoMetaDTO.setProcessInstanceId(processInstanceId);
|
|
logInfoMetaDTO.setProcessInstanceId(processInstanceId);
|
|
logInfoMetaDTO.setTerminalIp(logDto.getCreateIp());
|
|
logInfoMetaDTO.setTerminalIp(logDto.getCreateIp());
|
|
// 请求发起
|
|
// 请求发起
|
|
- logInfoMetaDTO.setBusinessType("21");
|
|
|
|
|
|
+ logInfoMetaDTO.setBusinessType(businessCode);
|
|
|
|
|
|
sendInfo(JSON.toJSONString(requestLog), "审批请求日志", logInfoMetaDTO);
|
|
sendInfo(JSON.toJSONString(requestLog), "审批请求日志", logInfoMetaDTO);
|
|
}
|
|
}
|
|
@@ -647,7 +647,7 @@ public class ApproveLogBusinessImpl implements IApproveLogBusiness {
|
|
String flowKey = processInstanceInfoDTO.getFlowKey();
|
|
String flowKey = processInstanceInfoDTO.getFlowKey();
|
|
String processInstanceId = processInstanceInfoDTO.getProcessInstanceId();
|
|
String processInstanceId = processInstanceInfoDTO.getProcessInstanceId();
|
|
//如果是保存并提交,则需要构建(申请请求日志-发起)对象
|
|
//如果是保存并提交,则需要构建(申请请求日志-发起)对象
|
|
- buildRequestLog(RequestDisposeTypeEnum.START.getValue(), logDto, "start", "开始", "start", flowKey, processInstanceId);
|
|
|
|
|
|
+ buildRequestLog(RequestDisposeTypeEnum.START.getValue(), logDto, "start", "开始", "start", flowKey, processInstanceId, "21");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|