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

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

Browse Source
This commit is contained in:
yjz
2024-01-22 18:23:45 +08:00
parent f6610bbb1d
commit 959e840746
3 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ConsultationNodeSort.java
+1 -1
View File
@@ -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; // 设计工程师
}
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
+14
View File
@@ -1012,12 +1012,26 @@ 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);
qw.eq(ProcessNode::getIsView, 1);
qw.eq(ProcessNode::getXmlNodeId, ConsultationTaskKey.MODULE_OWNER_END_3);
processNode2 = processNodeService.getOne(qw, false);
// 各部所主管级领导审批
LambdaQueryWrapper<ProcessNode> 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<ProcessNodeLink> linkList = new ArrayList<>();
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java
+19
View File
@@ -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<ProcessNode>()
.eq(ProcessNode::getProcessDefinitionId, processDefinitionId)
.eq(ProcessNode::getXmlNodeId, ConsultationTaskKey.DEPART_LEADER_END_4));
if (!Objects.isNull(processNode)){
processNodeLinkService.remove(
new LambdaQueryWrapper<ProcessNodeLink>()
.eq(ProcessNodeLink::getProcessDefinitionId, processDefinitionId)
.eq(ProcessNodeLink::getProcessInstanceId, processInstanceId)
.eq(ProcessNodeLink::getProcessNodeId, processNode.getId()));
}
}
// 根据流程实例id和任务处理人查询任务
Task task = taskService.createTaskQuery()
.processInstanceId(processInstanceId)