From ecef18e8deca26e492e8193b47bb953a8163f8cc Mon Sep 17 00:00:00 2001
From: wodeyangzipingpingwuqi <zhengweilins@foxmail.com>
Date: Mon, 20 May 2024 16:59:24 +0800
Subject: [PATCH] =?UTF-8?q?fix(dev=5F1.0.0=5Fbeta2):=201=E3=80=81=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=B5=81=E4=BB=BB=E5=8A=A1=E6=98=BE=E7=A4=BA=E4=B8=8D?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE=EF=BC=88I9QN0R=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../persistence/mapper/JobSummaryMapper.java           |  2 ++
 .../main/resources/mysql/mapper/JobSummaryMapper.xml   | 10 ++++++++++
 .../server/web/service/impl/DashBoardServiceImpl.java  |  7 +++++--
 3 files changed, 17 insertions(+), 2 deletions(-)

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<JobSummary> {
 
     IPage<Task> jobTaskList(@Param("ew") Wrapper<Job> wrapper, Page<Object> page);
 
+    IPage<Task> workflowTaskList(@Param("ew") Wrapper<Job> wrapper, Page<Object> page);
+
     List<DashboardLineResponseDO> jobLineList(@Param("dateFormat") String dateFormat, @Param("ew") Wrapper<JobSummary> wrapper);
 
     List<Rank> dashboardRank(@Param("systemTaskType") Integer systemTaskType, @Param("ew") Wrapper<JobSummary> 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
     </select>
+
+    <select id="workflowTaskList"
+            resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardRetryLineResponseDO$Task">
+        SELECT group_name AS groupName,
+               SUM(CASE WHEN (workflow_status = 1) THEN 1 ELSE 0 END) AS run,
+               COUNT(*) AS total
+        FROM sj_workflow
+                 ${ew.customSqlSegment}
+        GROUP BY namespace_id, group_name
+    </select>
 </mapper>
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<Object> pager = new Page<>(baseQueryVO.getPage(), baseQueryVO.getSize());
         LambdaQueryWrapper<RetrySceneConfig> wrapper = new LambdaQueryWrapper<RetrySceneConfig>()
+
                 .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<Job> wrapper = new LambdaQueryWrapper<Job>()
+                .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<DashboardRetryLineResponseDO.Task> page = jobSummaryMapper.jobTaskList(wrapper, pager);
-        List<DashboardRetryLineResponseVO.Task> taskList = JobSummaryResponseVOConverter.INSTANCE.convertList(page.getRecords());
+        IPage<DashboardRetryLineResponseDO.Task> taskIPage = SystemModeEnum.JOB.name().equals(mode) ?
+                jobSummaryMapper.jobTaskList(wrapper, pager) : jobSummaryMapper.workflowTaskList(wrapper, pager);
+        List<DashboardRetryLineResponseVO.Task> taskList = JobSummaryResponseVOConverter.INSTANCE.convertList(taskIPage.getRecords());
         PageResult<List<DashboardRetryLineResponseVO.Task>> pageResult = new PageResult<>(
                 new PageDTO(pager.getCurrent(), pager.getSize(), pager.getTotal()),
                 taskList);