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

fix: 人员信息接口

Browse Source
This commit is contained in:
yjz
2024-07-24 17:05:43 +08:00
parent defba9de90
commit 4c465dd2c6
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java
+11 -12
View File
@@ -29,10 +29,7 @@ import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.jero.modules.activiti.common.ActivitiCommon.DISTRIBUTE; import static com.jero.modules.activiti.common.ActivitiCommon.DISTRIBUTE;
@@ -150,18 +147,20 @@ public class ProcessNodeService extends ServiceImpl<ProcessNodeMapper, ProcessNo
if (processDefinitionId.contains(ProcessType.STANDARD_COMPLIANCE_CHECK.getProcessKey())) { if (processDefinitionId.contains(ProcessType.STANDARD_COMPLIANCE_CHECK.getProcessKey())) {
specialProcessScc(processNodeList, processInstanceId); specialProcessScc(processNodeList, processInstanceId);
} }
// 制修订流程特殊处理
if (processDefinitionId.contains(ProcessType.STANDARD_INTERPRET.getProcessKey())) { if (processDefinitionId.contains(ProcessType.STANDARD_INTERPRET.getProcessKey())) {
ProcessAll processAll = processAllService.getOne(new LambdaQueryWrapper<ProcessAll>() ProcessAll processAll = processAllService.getOne(new LambdaQueryWrapper<ProcessAll>()
.eq(ProcessAll::getProcessInstanceId, processInstanceId) .eq(ProcessAll::getProcessInstanceId, processInstanceId)
.ne(ProcessAll::getPrcStatus, ProcessStatusEnum.WITHDRAWN.getValue()), false); .ne(ProcessAll::getPrcStatus, ProcessStatusEnum.WITHDRAWN.getValue()), false);
ProcessStandardInterpret processStandardInterpret = processStandardInterpretService.getOne( if (!Objects.isNull(processAll)){
new LambdaQueryWrapper<ProcessStandardInterpret>() ProcessStandardInterpret processStandardInterpret = processStandardInterpretService.getOne(
.eq(ProcessStandardInterpret::getProjectId, processAll.getProjectId())); new LambdaQueryWrapper<ProcessStandardInterpret>()
if (!String.valueOf(StandardInterpretCommon.IS_DISTRIBUTE_1) .eq(ProcessStandardInterpret::getProjectId, processAll.getProjectId()));
.equals(processStandardInterpret.getDistribute())){ if (!String.valueOf(StandardInterpretCommon.IS_DISTRIBUTE_1)
processNodeList.removeIf(v -> .equals(processStandardInterpret.getDistribute())){
StandardInterpretCommon.MASTER_INTERPRET_SUMMARY.equals(v.getXmlNodeId())); processNodeList.removeIf(v ->
StandardInterpretCommon.MASTER_INTERPRET_SUMMARY.equals(v.getXmlNodeId()));
}
} }
} }
return processNodeList; return processNodeList;