|
@@ -4099,6 +4099,14 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
|
|
.variableValueEquals(WorkflowConstant.PROCESS_SERIAL_NUMBER_KEY, StrUtil.isNumeric(dto.getKeyword()) ? Convert.toLong(dto.getKeyword()) : 0L)
|
|
.variableValueEquals(WorkflowConstant.PROCESS_SERIAL_NUMBER_KEY, StrUtil.isNumeric(dto.getKeyword()) ? Convert.toLong(dto.getKeyword()) : 0L)
|
|
.endOr();
|
|
.endOr();
|
|
}
|
|
}
|
|
|
|
+ // 发起人
|
|
|
|
+ if (StrUtil.isNotBlank(dto.getStartUserName())) {
|
|
|
|
+ historicProcessInstanceQuery.variableValueLike(WorkflowConstant.PROCESS_START_USER_NAME_KEY, StringPool.PERCENT + dto.getStartUserName() + StringPool.PERCENT);
|
|
|
|
+ }
|
|
|
|
+ // 流程任务模板名称
|
|
|
|
+ if (StrUtil.isNotBlank(dto.getProcessSchemaName())) {
|
|
|
|
+ historicProcessInstanceQuery.variableValueLike(WorkflowConstant.PROCESS_SCHEMA_NAME_KEY, StringPool.PERCENT + dto.getProcessSchemaName() + StringPool.PERCENT);
|
|
|
|
+ }
|
|
if (dto.getType() == 1) {
|
|
if (dto.getType() == 1) {
|
|
historicProcessInstanceQuery.finished();
|
|
historicProcessInstanceQuery.finished();
|
|
}
|
|
}
|
|
@@ -4162,7 +4170,9 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
|
|
PageOutput<MonitorPageVo> output = new PageOutput<>();
|
|
PageOutput<MonitorPageVo> output = new PageOutput<>();
|
|
output.setCurrentPage(dto.getLimit());
|
|
output.setCurrentPage(dto.getLimit());
|
|
output.setPageSize(dto.getSize());
|
|
output.setPageSize(dto.getSize());
|
|
- output.setTotal(Convert.toInt(historicProcessInstanceQuery.count()));
|
|
|
|
|
|
+ if (processIds.size() > 0) {
|
|
|
|
+ output.setTotal(Convert.toInt(historicProcessInstanceQuery.count()));
|
|
|
|
+ }
|
|
output.setList(result);
|
|
output.setList(result);
|
|
return output;
|
|
return output;
|
|
}
|
|
}
|