admin/wisdomisite-flow-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

包头待催办筛选

Browse Source
This commit is contained in:
guoshengxiong 2025-01-15 14:27:04 +08:00
parent 9cca6352f9
commit 132d2f544f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/wflow/workflow/service/impl/ProcessInstanceServiceImpl.java
View File

@ -433,7 +433,6 @@ public class ProcessInstanceServiceImpl implements ProcessInstanceService {
instanceQuery.processInstanceTenantId(TenantContextHolder.getTenantId()); instanceQuery.processInstanceTenantId(TenantContextHolder.getTenantId());
Executor.builder() Executor.builder()
//customStatus 1待催办2已办结（只有PASS） //customStatus 1待催办2已办结（只有PASS）
.ifNotBlankNext(Objects.equals(customStatus, 1) ? "PRE_%" : null, instanceQuery::processInstanceBusinessStatusLike)
.ifNotBlankNext(Objects.equals(customStatus, 2) ? ProcessStatus.PASS.toString() : null, instanceQuery::processInstanceBusinessStatus) .ifNotBlankNext(Objects.equals(customStatus, 2) ? ProcessStatus.PASS.toString() : null, instanceQuery::processInstanceBusinessStatus)
.ifNotBlankNext(startUser, instanceQuery::startedBy) .ifNotBlankNext(startUser, instanceQuery::startedBy)
.ifNotBlankNext(code, instanceQuery::processDefinitionKey) .ifNotBlankNext(code, instanceQuery::processDefinitionKey)
@ -452,6 +451,9 @@ public class ProcessInstanceServiceImpl implements ProcessInstanceService {
instanceQuery.variableValueLike(fieldId, "%" + fieldVal + "%"); instanceQuery.variableValueLike(fieldId, "%" + fieldVal + "%");
} }
}); });
if (Objects.equals(customStatus, 1)) {
instanceQuery.or().processInstanceBusinessStatusLike("PRE_%").unfinished().endOr();
}
List<HistoricProcessInstance> historicProcessInstances = new ArrayList<>(); List<HistoricProcessInstance> historicProcessInstances = new ArrayList<>();
if (StringUtils.isNotBlank(key)) { if (StringUtils.isNotBlank(key)) {
historicProcessInstances = instanceQuery historicProcessInstances = instanceQuery