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

fix(标准征求意见流程): 81109

Browse Source
This commit is contained in:
yjz
2024-01-23 16:42:57 +08:00
parent c5af015076
commit 128fd7b2cf
2 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
+16 -2
View File
@@ -1012,7 +1012,6 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
ProcessNode processNode = processNodeService.getOne(queryWrapper, false);
ProcessNode processNode2 = new ProcessNode();
ProcessNode processNode3 = new ProcessNode();
if (Objects.equals(sort, ConsultationNodeSort.MODULE_OWNER_LIST)){
LambdaQueryWrapper<ProcessNode> qw = new LambdaQueryWrapper<>();
qw.eq(ProcessNode::getProcessDefinitionId, processDefinitionId);
@@ -1025,7 +1024,22 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
qw2.eq(ProcessNode::getProcessDefinitionId, processDefinitionId);
qw2.eq(ProcessNode::getIsView, 1);
qw2.eq(ProcessNode::getXmlNodeId, ConsultationTaskKey.DEPART_LEADER_END_4);
processNode3 = processNodeService.getOne(qw2, false);
ProcessNode processNode3 = processNodeService.getOne(qw2, false);
ProcessNodeLink link = new ProcessNodeLink();
link.setProcessDefinitionId(processDefinitionId);
link.setProcessNodeId(processNode3.getId());
link.setProcessInstanceId(processInstanceId);
link.setUserId(CurrentUserUtil.getId());
processNodeLinkService.save(link);
}
if (Objects.equals(sort, ConsultationNodeSort.DESIGN_ENGINEER_LIST)){
// 各部所主管级领导汇总
LambdaQueryWrapper<ProcessNode> qw = new LambdaQueryWrapper<>();
qw.eq(ProcessNode::getProcessDefinitionId, processDefinitionId);
qw.eq(ProcessNode::getIsView, 1);
qw.eq(ProcessNode::getXmlNodeId, ConsultationTaskKey.DEPART_LEADER_COLLECT_3);
ProcessNode processNode3 = processNodeService.getOne(qw, false);
ProcessNodeLink link = new ProcessNodeLink();
link.setProcessDefinitionId(processDefinitionId);
link.setProcessNodeId(processNode3.getId());
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java
+13
View File
@@ -110,6 +110,19 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
.eq(ProcessNodeLink::getProcessInstanceId, processInstanceId)
.eq(ProcessNodeLink::getProcessNodeId, processNode.getId()));
}
// 删除各部所主管级领导汇总节点处理人
ProcessNode processNode2 = processNodeService.getOne(
new LambdaQueryWrapper<ProcessNode>()
.eq(ProcessNode::getProcessDefinitionId, processDefinitionId)
.eq(ProcessNode::getXmlNodeId, ConsultationTaskKey.DEPART_LEADER_COLLECT_3));
if (!Objects.isNull(processNode2)){
processNodeLinkService.remove(
new LambdaQueryWrapper<ProcessNodeLink>()
.eq(ProcessNodeLink::getProcessDefinitionId, processDefinitionId)
.eq(ProcessNodeLink::getProcessInstanceId, processInstanceId)
.eq(ProcessNodeLink::getProcessNodeId, processNode2.getId()));
}
}
// 根据流程实例id和任务处理人查询任务