ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 1、替换oa待办传参中的processId为taskId

Browse Source 
2、转办时oa待办传参中的taskId增加时间戳区分
This commit is contained in:
lijiarao
2024-06-21 14:34:59 +08:00
parent 9da0f73167
commit 6452c0c59f
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java
+6 -5
View File
@@ -173,11 +173,12 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
hiworkTodo.setSysCode(hiworkSysCode);
String date = DateUtil.formatDateTime(new Date());
String taskId = processApprovalRecord.getTaskId();
String transferTaskId = processApprovalRecord.getTransferTaskId();
hiworkTodo.setFlowid(processApprovalRecord.getProcessInstanceId());
hiworkTodo.setProcessId(processApprovalRecord.getProcessInstanceId());
hiworkTodo.setProcessId(taskId);
hiworkTodo.setProcessType(PROCESS_TYPE);
hiworkTodo.setTaskId(processApprovalRecord.getTaskId());
hiworkTodo.setTaskId(transferTaskId!=null?transferTaskId:taskId);
hiworkTodo.setTaskName(processApprovalRecord.getTaskName());
LambdaQueryWrapper<ProcessNode> wrapper = new LambdaQueryWrapper<>();
@@ -228,7 +229,7 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
//.replaceAll("\\?","%3F")
.replace("{projectId}",projectId)
.replace("{taskName}",processApprovalRecord.getTaskName())
.replace("{taskId}",processApprovalRecord.getTaskId())
.replace("{taskId}", taskId)
.replace("{processInstanceId}",processApprovalRecord.getProcessInstanceId())
.replace("{nodeId}",processApprovalRecord.getNodeId());
// 跳转链接
@@ -240,7 +241,7 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
//.replaceAll("\\?","%3F")
.replace("{projectId}",projectId)
.replace("{taskName}",processApprovalRecord.getTaskName())
.replace("{taskId}",processApprovalRecord.getTaskId())
.replace("{taskId}", taskId)
.replace("{processInstanceId}",processApprovalRecord.getProcessInstanceId())
.replace("{nodeId}",processApprovalRecord.getNodeId());
String appBusinessLink = appUrl.replace("{url}", Objects.requireNonNull(ProcessTypeEnum.getFontReturnUrlPc(processAll.getPrcType())));
laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessApprovalRecord.java
+7
View File
@@ -199,4 +199,11 @@ public class ProcessApprovalRecord {
*/
@ApiModelProperty(value = "超期标识（0：未超期 1：已超期）")
private String overDue;
/**
* 转办任务id
*/
@TableField(value = "transfer_task_id")
@ApiModelProperty(value = "转办任务id")
private String transferTaskId;
}
laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java
+5 -1
View File
@@ -200,7 +200,11 @@ public class MyGlobalEventListener implements ActivitiEventListener {
// 对接统一平台生成办结
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();
hiworkTodoAdd.setToUserId(assignee);