diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ConsultationNodeSort.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ConsultationNodeSort.java index aef5990d..3f7fc424 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ConsultationNodeSort.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ConsultationNodeSort.java @@ -9,6 +9,6 @@ public class ConsultationNodeSort { public final static Integer MODULE_OWNER_LIST = 3; // 模块负责人 - public final static Integer DESIGN_ENGINEER_LIST = 4; // 模块负责人 + public final static Integer DESIGN_ENGINEER_LIST = 4; // 设计工程师 } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java index 77a2b859..eb848c77 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java @@ -1012,12 +1012,26 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl qw = new LambdaQueryWrapper<>(); qw.eq(ProcessNode::getProcessDefinitionId, processDefinitionId); qw.eq(ProcessNode::getIsView, 1); qw.eq(ProcessNode::getXmlNodeId, ConsultationTaskKey.MODULE_OWNER_END_3); processNode2 = processNodeService.getOne(qw, false); + + // 各部所主管级领导审批 + LambdaQueryWrapper qw2 = new LambdaQueryWrapper<>(); + qw2.eq(ProcessNode::getProcessDefinitionId, processDefinitionId); + qw2.eq(ProcessNode::getIsView, 1); + qw2.eq(ProcessNode::getXmlNodeId, ConsultationTaskKey.DEPART_LEADER_END_4); + 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); } List linkList = new ArrayList<>(); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java index 2dc43bf1..14082b21 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java @@ -12,6 +12,8 @@ import com.jero.modules.activiti.enums.CommitFlagEnum; import com.jero.modules.activiti.process.common.common.DraftCommon; import com.jero.modules.activiti.process.common.entity.ProcessDraft; import com.jero.modules.activiti.process.common.service.ProcessDraftService; +import com.jero.modules.activiti.process.fb.common.ConsultationTaskKey; +import com.jero.modules.activiti.process.fb.common.ProcessDefinitionKey; import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO; import com.jero.modules.activiti.process.fb.dto.BasicTaskInfoDTO; import com.jero.modules.activiti.process.fb.dto.ProcessDTO; @@ -93,6 +95,23 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { // 保存选人信息 processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userInfoMap); + // 标准征求意见流程特殊处理 + String processDefinitionKey = processInstance.getProcessDefinitionKey(); + if (ProcessDefinitionKey.FB_STANDARD_CONSULTATION.equals(processDefinitionKey)){ + // 删除各部所主管级领导审批节点处理人 + ProcessNode processNode = processNodeService.getOne( + new LambdaQueryWrapper() + .eq(ProcessNode::getProcessDefinitionId, processDefinitionId) + .eq(ProcessNode::getXmlNodeId, ConsultationTaskKey.DEPART_LEADER_END_4)); + if (!Objects.isNull(processNode)){ + processNodeLinkService.remove( + new LambdaQueryWrapper() + .eq(ProcessNodeLink::getProcessDefinitionId, processDefinitionId) + .eq(ProcessNodeLink::getProcessInstanceId, processInstanceId) + .eq(ProcessNodeLink::getProcessNodeId, processNode.getId())); + } + } + // 根据流程实例id和任务处理人查询任务 Task task = taskService.createTaskQuery() .processInstanceId(processInstanceId)