diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/JobSummaryMapper.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/JobSummaryMapper.java index e3c1df2c..54240066 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/JobSummaryMapper.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/JobSummaryMapper.java @@ -31,6 +31,8 @@ public interface JobSummaryMapper extends BaseMapper { IPage jobTaskList(@Param("ew") Wrapper wrapper, Page page); + IPage workflowTaskList(@Param("ew") Wrapper wrapper, Page page); + List jobLineList(@Param("dateFormat") String dateFormat, @Param("ew") Wrapper wrapper); List dashboardRank(@Param("systemTaskType") Integer systemTaskType, @Param("ew") Wrapper wrapper); diff --git a/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml b/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml index 1959d845..64f71d45 100644 --- a/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml +++ b/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml @@ -120,4 +120,14 @@ ${ew.customSqlSegment} GROUP BY namespace_id, group_name + + diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/DashBoardServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/DashBoardServiceImpl.java index 676e83f7..a7bcf980 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/DashBoardServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/DashBoardServiceImpl.java @@ -162,6 +162,7 @@ public class DashBoardServiceImpl implements DashBoardService { // 重试任务列表 Page pager = new Page<>(baseQueryVO.getPage(), baseQueryVO.getSize()); LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .eq(RetrySceneConfig::getNamespaceId, namespaceId) .in(CollUtil.isNotEmpty(groupNames), RetrySceneConfig::getGroupName, groupNames); // 针对SQL Server的分页COUNT, 自定义statement ID @@ -230,6 +231,7 @@ public class DashBoardServiceImpl implements DashBoardService { // 任务类型 Integer systemTaskType = SystemModeEnum.JOB.name().equals(mode) ? SyetemTaskTypeEnum.JOB.getType() : SyetemTaskTypeEnum.WORKFLOW.getType(); LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .eq(Job::getDeleted, 0) .eq(Job::getNamespaceId, namespaceId) .in(CollUtil.isNotEmpty(groupNames), Job::getGroupName, groupNames); // 针对SQL Server的分页COUNT, 自定义statement ID @@ -238,8 +240,9 @@ public class DashBoardServiceImpl implements DashBoardService { pager.setTotal(jobSummaryMapper.countJobTask(wrapper)); } - IPage page = jobSummaryMapper.jobTaskList(wrapper, pager); - List taskList = JobSummaryResponseVOConverter.INSTANCE.convertList(page.getRecords()); + IPage taskIPage = SystemModeEnum.JOB.name().equals(mode) ? + jobSummaryMapper.jobTaskList(wrapper, pager) : jobSummaryMapper.workflowTaskList(wrapper, pager); + List taskList = JobSummaryResponseVOConverter.INSTANCE.convertList(taskIPage.getRecords()); PageResult> pageResult = new PageResult<>( new PageDTO(pager.getCurrent(), pager.getSize(), pager.getTotal()), taskList);