QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(88103): 不分发分支会签节点处理

Browse Source
This commit is contained in:
yjz
2024-08-06 11:18:16 +08:00
parent c1d5a9a6e9
commit 6f94da52de
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
+16
View File
@@ -30,6 +30,8 @@ import com.jero.modules.activiti.process.common.entity.ProcessDraft;
import com.jero.modules.activiti.process.common.service.ProcessDraftService; import com.jero.modules.activiti.process.common.service.ProcessDraftService;
import com.jero.modules.activiti.process.standardComplianceCheck.common.ProcessStandardComplianceCheckConstants; import com.jero.modules.activiti.process.standardComplianceCheck.common.ProcessStandardComplianceCheckConstants;
import com.jero.modules.activiti.process.standardinterpret.common.StandardInterpretCommon; import com.jero.modules.activiti.process.standardinterpret.common.StandardInterpretCommon;
import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpret;
import com.jero.modules.activiti.process.standardinterpret.service.ProcessStandardInterpretService;
import com.jero.modules.activiti.util.ActivityCountersign; import com.jero.modules.activiti.util.ActivityCountersign;
import com.jero.modules.activiti.util.SpringContextUtil; import com.jero.modules.activiti.util.SpringContextUtil;
import com.jero.modules.activiti.vo.DelegateTaskParam; import com.jero.modules.activiti.vo.DelegateTaskParam;
@@ -91,6 +93,8 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
private ProcessNodeLinkService processNodeLinkService; private ProcessNodeLinkService processNodeLinkService;
@Resource @Resource
private ManagementService managementService; private ManagementService managementService;
@Resource
private ProcessStandardInterpretService processStandardInterpretService;
private static final List<Integer> INSPECT_PROCESS = Arrays.asList(); private static final List<Integer> INSPECT_PROCESS = Arrays.asList();
public ProcessAll getByProcessInstanceId(String processInstanceId){ public ProcessAll getByProcessInstanceId(String processInstanceId){
@@ -318,6 +322,7 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
String taskId = param.getTaskId(); String taskId = param.getTaskId();
String userId = param.getUserId(); String userId = param.getUserId();
Integer prcType = param.getPrcType(); Integer prcType = param.getPrcType();
String projectId = param.getProjectId();
Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
String processInstanceId = task.getProcessInstanceId(); String processInstanceId = task.getProcessInstanceId();
@@ -335,6 +340,17 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
throw new JeroBootException("数据不存在"); throw new JeroBootException("数据不存在");
} }
String xmlNodeId = record.getNodeId(); String xmlNodeId = record.getNodeId();
// 解读流程特殊处理
if (ProcessTypeEnum.STANDARD_INTERPRET.getValue().equals(prcType)){
ProcessStandardInterpret processStandardInterpret = processStandardInterpretService.getOne(
new LambdaQueryWrapper<ProcessStandardInterpret>()
.eq(ProcessStandardInterpret::getProjectId, param.getProjectId()), false);
if (Objects.nonNull(processStandardInterpret)
&& StandardInterpretCommon.IS_DISTRIBUTE_2.equals(processStandardInterpret.getDistribute())){
// 未分发
xmlNodeId = xmlNodeId.replace("2", "1");
}
}
LambdaQueryWrapper<ProcessNode> queryProcessNode = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ProcessNode> queryProcessNode = new LambdaQueryWrapper<>();
queryProcessNode.eq(ProcessNode::getProcessDefinitionId,processDefinitionId); queryProcessNode.eq(ProcessNode::getProcessDefinitionId,processDefinitionId);
queryProcessNode.eq(ProcessNode::getXmlNodeId,xmlNodeId); queryProcessNode.eq(ProcessNode::getXmlNodeId,xmlNodeId);