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

update 集成统一代办

Browse Source
This commit is contained in:
lijiarao
2024-03-11 16:20:38 +08:00
parent c950bc877f
commit 4652a52572
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/HiworkTodo.java
+1 -1
View File
@@ -36,7 +36,7 @@ public class HiworkTodo {
private String taskId; private String taskId;
@ApiModelProperty(value = "节点名称") @ApiModelProperty(value = "节点名称")
private String taskName; private String taskName;
@ApiModelProperty(value = "是否会签") @ApiModelProperty(value = "是否进入下一节点（0是 1不是）")
private Integer multiInstance; private Integer multiInstance;
@ApiModelProperty(value = "节点编号") @ApiModelProperty(value = "节点编号")
private String nodeBusiCode; private String nodeBusiCode;
laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java
+9 -2
View File
@@ -142,7 +142,7 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
ProcessNode processNode = processNodeService.getOne(wrapper,false); ProcessNode processNode = processNodeService.getOne(wrapper,false);
if(!Objects.isNull(processNode)){ if(!Objects.isNull(processNode)){
if(processNode.getNodeName().contains("会签")){ if(processNode.getNodeName().contains("会签")){
hiworkTodo.setMultiInstance(1);
} }
hiworkTodo.setNodeBusiCode(processNode.getXmlNodeId()); hiworkTodo.setNodeBusiCode(processNode.getXmlNodeId());
// 是否显示（0否，1是） // 是否显示（0否，1是）
@@ -192,7 +192,14 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
hiworkTodo.setUserName(sysUser.getRealname()); hiworkTodo.setUserName(sysUser.getRealname());
} }
hiworkTodo.setReceiveTime(Instant.now()); hiworkTodo.setReceiveTime(Instant.now());
hiworkTodo.setIsTodo(String.valueOf(processApprovalRecord.getFinishFlag())); //2已完成时进入下一节点
Integer finishFlag = processApprovalRecord.getFinishFlag();
if (finishFlag.equals(2)){
hiworkTodo.setMultiInstance(0);
}else {
hiworkTodo.setMultiInstance(1);
}
hiworkTodo.setIsTodo(String.valueOf(finishFlag));
hiworkTodoList.add(hiworkTodo); hiworkTodoList.add(hiworkTodo);
} }
} }
laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java
+2 -2
View File
@@ -202,7 +202,7 @@ public class MyGlobalEventListener implements ActivitiEventListener {
ProcessApprovalRecordService recordService = SpringContextUtil.getBean(ProcessApprovalRecordService.class); ProcessApprovalRecordService recordService = SpringContextUtil.getBean(ProcessApprovalRecordService.class);
String taskId = delegateTask.getId(); String taskId = delegateTask.getId();
String assignee = delegateTask.getAssignee(); String assignee = delegateTask.getAssignee();
String processDefinitionId = delegateTask.getProcessDefinitionId();
//更新审批信息为完成 //更新审批信息为完成
LambdaQueryWrapper<ProcessApprovalRecord> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ProcessApprovalRecord> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ProcessApprovalRecord::getTaskId,taskId); wrapper.eq(ProcessApprovalRecord::getTaskId,taskId);
@@ -260,7 +260,7 @@ public class MyGlobalEventListener implements ActivitiEventListener {
List<HiworkTodoAdd> list = new ArrayList<>(); List<HiworkTodoAdd> list = new ArrayList<>();
HiworkTodoAdd hiworkTodoAdd = new HiworkTodoAdd(); HiworkTodoAdd hiworkTodoAdd = new HiworkTodoAdd();
hiworkTodoAdd.setRecordId(approvalRecord.getId()); hiworkTodoAdd.setRecordId(approvalRecord.getId());
hiworkTodoAdd.setProcessDefinitionId(approvalRecord.getProcessInstanceId()); hiworkTodoAdd.setProcessDefinitionId(processDefinitionId);
list.add(hiworkTodoAdd); list.add(hiworkTodoAdd);
pushWorkflowIntegrationAPI.sendTodoTask(list); pushWorkflowIntegrationAPI.sendTodoTask(list);
} }