update 1、替换oa待办传参中的processId为taskId
2、转办时oa待办传参中的taskId增加时间戳区分
This commit is contained in:
+6
-5
@@ -173,11 +173,12 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
|
|||||||
hiworkTodo.setSysCode(hiworkSysCode);
|
hiworkTodo.setSysCode(hiworkSysCode);
|
||||||
|
|
||||||
String date = DateUtil.formatDateTime(new Date());
|
String date = DateUtil.formatDateTime(new Date());
|
||||||
|
String taskId = processApprovalRecord.getTaskId();
|
||||||
|
String transferTaskId = processApprovalRecord.getTransferTaskId();
|
||||||
hiworkTodo.setFlowid(processApprovalRecord.getProcessInstanceId());
|
hiworkTodo.setFlowid(processApprovalRecord.getProcessInstanceId());
|
||||||
hiworkTodo.setProcessId(processApprovalRecord.getProcessInstanceId());
|
hiworkTodo.setProcessId(taskId);
|
||||||
hiworkTodo.setProcessType(PROCESS_TYPE);
|
hiworkTodo.setProcessType(PROCESS_TYPE);
|
||||||
hiworkTodo.setTaskId(processApprovalRecord.getTaskId());
|
hiworkTodo.setTaskId(transferTaskId!=null?transferTaskId:taskId);
|
||||||
hiworkTodo.setTaskName(processApprovalRecord.getTaskName());
|
hiworkTodo.setTaskName(processApprovalRecord.getTaskName());
|
||||||
|
|
||||||
LambdaQueryWrapper<ProcessNode> wrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<ProcessNode> wrapper = new LambdaQueryWrapper<>();
|
||||||
@@ -228,7 +229,7 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
|
|||||||
//.replaceAll("\\?","%3F")
|
//.replaceAll("\\?","%3F")
|
||||||
.replace("{projectId}",projectId)
|
.replace("{projectId}",projectId)
|
||||||
.replace("{taskName}",processApprovalRecord.getTaskName())
|
.replace("{taskName}",processApprovalRecord.getTaskName())
|
||||||
.replace("{taskId}",processApprovalRecord.getTaskId())
|
.replace("{taskId}", taskId)
|
||||||
.replace("{processInstanceId}",processApprovalRecord.getProcessInstanceId())
|
.replace("{processInstanceId}",processApprovalRecord.getProcessInstanceId())
|
||||||
.replace("{nodeId}",processApprovalRecord.getNodeId());
|
.replace("{nodeId}",processApprovalRecord.getNodeId());
|
||||||
// 跳转链接
|
// 跳转链接
|
||||||
@@ -240,7 +241,7 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
|
|||||||
//.replaceAll("\\?","%3F")
|
//.replaceAll("\\?","%3F")
|
||||||
.replace("{projectId}",projectId)
|
.replace("{projectId}",projectId)
|
||||||
.replace("{taskName}",processApprovalRecord.getTaskName())
|
.replace("{taskName}",processApprovalRecord.getTaskName())
|
||||||
.replace("{taskId}",processApprovalRecord.getTaskId())
|
.replace("{taskId}", taskId)
|
||||||
.replace("{processInstanceId}",processApprovalRecord.getProcessInstanceId())
|
.replace("{processInstanceId}",processApprovalRecord.getProcessInstanceId())
|
||||||
.replace("{nodeId}",processApprovalRecord.getNodeId());
|
.replace("{nodeId}",processApprovalRecord.getNodeId());
|
||||||
String appBusinessLink = appUrl.replace("{url}", Objects.requireNonNull(ProcessTypeEnum.getFontReturnUrlPc(processAll.getPrcType())));
|
String appBusinessLink = appUrl.replace("{url}", Objects.requireNonNull(ProcessTypeEnum.getFontReturnUrlPc(processAll.getPrcType())));
|
||||||
|
|||||||
@@ -199,4 +199,11 @@ public class ProcessApprovalRecord {
|
|||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "超期标识(0:未超期 1:已超期)")
|
@ApiModelProperty(value = "超期标识(0:未超期 1:已超期)")
|
||||||
private String overDue;
|
private String overDue;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 转办任务id
|
||||||
|
*/
|
||||||
|
@TableField(value = "transfer_task_id")
|
||||||
|
@ApiModelProperty(value = "转办任务id")
|
||||||
|
private String transferTaskId;
|
||||||
}
|
}
|
||||||
+5
-1
@@ -200,7 +200,11 @@ public class MyGlobalEventListener implements ActivitiEventListener {
|
|||||||
|
|
||||||
// 对接统一平台生成办结
|
// 对接统一平台生成办结
|
||||||
pushWorkflowIntegrationAPI.sendActivityComplete(list);
|
pushWorkflowIntegrationAPI.sendActivityComplete(list);
|
||||||
|
//更新转办任务id
|
||||||
|
LambdaUpdateWrapper<ProcessApprovalRecord> update = new LambdaUpdateWrapper<>();
|
||||||
|
update.eq(ProcessApprovalRecord::getTaskId,taskId);
|
||||||
|
update.set(ProcessApprovalRecord::getTransferTaskId,taskId+"_"+System.currentTimeMillis());
|
||||||
|
recordService.update(update);
|
||||||
// 生成被转办人的待办
|
// 生成被转办人的待办
|
||||||
list.clear();
|
list.clear();
|
||||||
hiworkTodoAdd.setToUserId(assignee);
|
hiworkTodoAdd.setToUserId(assignee);
|
||||||
|
|||||||
Reference in New Issue
Block a user