gtsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

feat: 2.6.0

Browse Source 
1. 修复工作流列表条件查询不生效问题
This commit is contained in:
byteblogs168 2024-01-16 09:27:07 +08:00
parent 094fa7130a
commit 16008b5cc0
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/WorkflowQueryVO.java
View File

@ -13,4 +13,9 @@ import lombok.EqualsAndHashCode;
@Data @Data
public class WorkflowQueryVO extends BaseQueryVO { public class WorkflowQueryVO extends BaseQueryVO {
private String groupName;
private String workflowName;
private Integer workflowStatus;
} }

13
easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/WorkflowServiceImpl.java
View File

@ -192,6 +192,19 @@ public class WorkflowServiceImpl implements WorkflowService {
LambdaQueryWrapper<Workflow> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Workflow> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(Workflow::getDeleted, StatusEnum.NO.getStatus()); queryWrapper.eq(Workflow::getDeleted, StatusEnum.NO.getStatus());
queryWrapper.eq(Workflow::getNamespaceId, userSessionVO.getNamespaceId()); queryWrapper.eq(Workflow::getNamespaceId, userSessionVO.getNamespaceId());
if (StrUtil.isNotBlank(queryVO.getGroupName())) {
queryWrapper.eq(Workflow::getGroupName, queryVO.getGroupName());
}
if (StrUtil.isNotBlank(queryVO.getWorkflowName())) {
queryWrapper.like(Workflow::getWorkflowName, queryVO.getWorkflowName());
}
if (Objects.nonNull(queryVO.getWorkflowStatus())) {
queryWrapper.eq(Workflow::getWorkflowStatus, queryVO.getWorkflowStatus());
}
queryWrapper.orderByDesc(Workflow::getId); queryWrapper.orderByDesc(Workflow::getId);
PageDTO<Workflow> page = workflowMapper.selectPage(pageDTO, queryWrapper); PageDTO<Workflow> page = workflowMapper.selectPage(pageDTO, queryWrapper);

6
frontend/src/views/job/WorkflowList.vue
View File

@ -16,13 +16,13 @@
</a-col> </a-col>
<a-col :md="8" :sm="24"> <a-col :md="8" :sm="24">
<a-form-item label="任务名称"> <a-form-item label="任务名称">
<a-input v-model="queryParam.jobName" placeholder="请输入任务名称" allowClear /> <a-input v-model="queryParam.workflowName" placeholder="请输入任务名称" allowClear />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="8" :sm="24"> <a-col :md="8" :sm="24">
<a-form-item label="状态"> <a-form-item label="状态">
<a-select v-model="queryParam.jobStatus" placeholder="请选择状态" allowClear> <a-select v-model="queryParam.workflowStatus" placeholder="请选择状态" allowClear>
<a-select-option v-for="(index, value) in jobStatusEnum" :value="value" :key="value"> <a-select-option v-for="(index, value) in workflowStatus" :value="value" :key="value">
{{ index.name }}</a-select-option {{ index.name }}</a-select-option
> >
</a-select> </a-select>