From 700b0091dc68cebda68cd67bac7634785310ccbd Mon Sep 17 00:00:00 2001
From: zhengweilin <zhengweilin@bw8848.com>
Date: Fri, 22 Mar 2024 17:58:47 +0800
Subject: [PATCH 1/4] =?UTF-8?q?feat:=203.2.0=20=E5=B7=A5=E4=BD=9C=E6=B5=81?=
 =?UTF-8?q?Dashboard=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/JobTaskBatchMapper.java            |  2 +-
 .../mysql/mapper/JobTaskBatchMapper.xml       |  2 +-
 .../support/schedule/JobSummarySchedule.java  |  5 +--
 frontend/src/views/dashboard/Analysis.vue     | 33 +++++++++++++++++--
 4 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobTaskBatchMapper.java b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobTaskBatchMapper.java
index 72bbbc33..3ba0bc2b 100644
--- a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobTaskBatchMapper.java
+++ b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobTaskBatchMapper.java
@@ -27,5 +27,5 @@ public interface JobTaskBatchMapper extends BaseMapper<JobTaskBatch> {
 
     List<JobBatchResponseDO> selectJobBatchListByIds(@Param("ids") List<Long> ids);
 
-    List<JobBatchSummaryResponseDO> summaryJobBatchList(@Param("from") LocalDateTime todayFrom, @Param("to") LocalDateTime to);
+    List<JobBatchSummaryResponseDO> summaryJobBatchList(@Param("type") Integer type, @Param("from") LocalDateTime todayFrom, @Param("to") LocalDateTime to);
 }
diff --git a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobTaskBatchMapper.xml b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobTaskBatchMapper.xml
index 62fbb987..362bb68c 100644
--- a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobTaskBatchMapper.xml
+++ b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobTaskBatchMapper.xml
@@ -55,7 +55,7 @@
                SUM(CASE WHEN (task_batch_status = 5) THEN 1 ELSE 0 END) AS stopNum,
                SUM(CASE WHEN (task_batch_status = 4) THEN 1 ELSE 0 END) AS failNum
         FROM job_task_batch
-        WHERE create_dt BETWEEN #{from} AND #{to}
+        WHERE system_task_type = #{type} AND create_dt BETWEEN #{from} AND #{to}
         GROUP BY namespace_id, group_name, job_id, task_batch_status, operation_reason
 
     </select>
diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobSummarySchedule.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobSummarySchedule.java
index b9a62dd4..ed59fe73 100644
--- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobSummarySchedule.java
+++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobSummarySchedule.java
@@ -6,6 +6,7 @@ import com.aizuda.easy.retry.common.core.util.JsonUtil;
 import com.aizuda.easy.retry.server.common.Lifecycle;
 import com.aizuda.easy.retry.server.common.config.SystemProperties;
 import com.aizuda.easy.retry.server.common.dto.JobTaskBatchReason;
+import com.aizuda.easy.retry.server.common.enums.SyetemTaskTypeEnum;
 import com.aizuda.easy.retry.server.common.schedule.AbstractSchedule;
 import com.aizuda.easy.retry.template.datasource.persistence.dataobject.JobBatchSummaryResponseDO;
 import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobSummaryMapper;
@@ -62,14 +63,14 @@ public class JobSummarySchedule extends AbstractSchedule implements Lifecycle {
                 // 定时按日实时查询统计数据（00:00:00 - 23:59:59）
                 LocalDateTime todayFrom = LocalDateTime.of(LocalDate.now(), LocalTime.MIN).plusDays(-i);
                 LocalDateTime todayTo = LocalDateTime.of(LocalDate.now(), LocalTime.MAX).plusDays(-i);
-                List<JobBatchSummaryResponseDO> summaryResponseDOList = jobTaskBatchMapper.summaryJobBatchList(todayFrom, todayTo);
+                List<JobBatchSummaryResponseDO> summaryResponseDOList = jobTaskBatchMapper.summaryJobBatchList(SyetemTaskTypeEnum.JOB.getType(), todayFrom, todayTo);
                 if (summaryResponseDOList == null || summaryResponseDOList.size() < 1) {
                     continue;
                 }
 
                 // insertOrUpdate
                 List<JobSummary> jobSummaryList = jobSummaryList(todayFrom, summaryResponseDOList);
-                 int totalJobSummary = jobSummaryMapper.insertOrUpdate(jobSummaryList);
+                int totalJobSummary = jobSummaryMapper.insertOrUpdate(jobSummaryList);
                 EasyRetryLog.LOCAL.debug("job summary dashboard success todayFrom:[{}] todayTo:[{}] total:[{}]", todayFrom, todayTo, totalJobSummary);
             }
         } catch (Exception e) {
diff --git a/frontend/src/views/dashboard/Analysis.vue b/frontend/src/views/dashboard/Analysis.vue
index 0f31d126..5310f0c8 100644
--- a/frontend/src/views/dashboard/Analysis.vue
+++ b/frontend/src/views/dashboard/Analysis.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <a-row :gutter="24">
-      <a-col :sm="24" :md="12" :xl="8" :style="{ marginBottom: '24px' }">
+      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
         <chart-card :loading="loading" :title="$t('dashboard.analysis.total-sales')" :total="retryTask.totalNum">
           <a-tooltip title="总任务量: 重试/回调任务量" slot="action">
             <a-icon type="info-circle-o" />
@@ -31,7 +31,7 @@
           </template>
         </chart-card>
       </a-col>
-      <a-col :sm="24" :md="12" :xl="8" :style="{ marginBottom: '24px' }">
+      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
         <chart-card :loading="loading" title="定时任务" :total="jobTask.totalNum">
           <a-tooltip title="成功率:总完成/总调度量;" slot="action">
             <a-icon type="info-circle-o" />
@@ -56,7 +56,34 @@
           </template>
         </chart-card>
       </a-col>
-      <a-col :sm="24" :md="12" :xl="8" :style="{ marginBottom: '24px' }">
+
+      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
+        <chart-card :loading="loading" title="工作流任务" :total="jobTask.totalNum"><!-- -->
+          <a-tooltip title="成功率:总完成/总调度量;" slot="action">
+            <a-icon type="info-circle-o" />
+          </a-tooltip>
+          <div>
+            <a-tooltip title="成功率">
+              <a-progress stroke-linecap="square" :percent="jobTask.successRate" />
+            </a-tooltip>
+          </div>
+          <template slot="footer">
+            {{ $t('dashboard.analysis.job_success') }}
+            <span>{{ jobTask.successNum }}</span>
+            <a-divider type="vertical" />
+            {{ $t('dashboard.analysis.job_fail') }}
+            <span>{{ jobTask.failNum }}</span>
+            <a-divider type="vertical" />
+            {{ $t('dashboard.analysis.job_stop') }}
+            <span>{{ jobTask.stopNum }}</span>
+            <a-divider type="vertical" />
+            {{ $t('dashboard.analysis.job_cancel') }}
+            <span>{{ jobTask.cancelNum }}</span>
+          </template>
+        </chart-card>
+      </a-col>
+
+      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
         <a href="#" @click="jumpPosList">
           <chart-card :loading="loading" title="总在线机器" :total="onLineService.total">
             <a-tooltip title="总在线机器:注册到系统的客户端和服务端之和" slot="action" >

From e3eb90de4c01bdd7c2dc682b0a5e4b46c7efb050 Mon Sep 17 00:00:00 2001
From: zhengweilin <zhengweilin@bw8848.com>
Date: Tue, 26 Mar 2024 10:52:03 +0800
Subject: [PATCH 2/4] =?UTF-8?q?feat:=203.2.0=20=E5=B7=A5=E4=BD=9C=E6=B5=81?=
 =?UTF-8?q?Dashboard=E6=8F=90=E4=BA=A4I93NGB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataobject/JobBatchSummaryResponseDO.java |   5 +
 .../persistence/mapper/JobSummaryMapper.java  |  30 ++--
 .../mapper/JobTaskBatchMapper.java            |   4 +-
 .../datasource/persistence/po/JobSummary.java |   4 +
 .../mysql/mapper/JobSummaryMapper.xml         |  47 ++---
 .../mysql/mapper/JobTaskBatchMapper.xml       |  18 +-
 .../common/enums/DashboardLineEnum.java       |  35 ++++
 .../support/schedule/JobSummarySchedule.java  |   1 +
 .../schedule/WorkflowJobSummarySchedule.java  | 135 ++++++++++++++
 .../web/controller/DashBoardController.java   |   3 +-
 .../response/DashboardCardResponseVO.java     |  21 +++
 .../server/web/service/DashBoardService.java  |   2 +-
 .../JobSummaryResponseVOConverter.java        |   5 +
 .../service/impl/DashBoardServiceImpl.java    |  31 +++-
 frontend/src/components/Charts/JobLine.vue    |   7 +-
 .../src/components/Charts/WorkFlowLine.vue    |  88 +++++++++
 .../locales/lang/zh-CN/dashboard/analysis.js  |   1 +
 frontend/src/views/dashboard/Analysis.vue     |  54 ++++--
 frontend/src/views/dashboard/JobAnalysis.vue  |  16 +-
 .../src/views/dashboard/WorkFlowAnalysis.vue  | 170 ++++++++++++++++++
 20 files changed, 604 insertions(+), 73 deletions(-)
 create mode 100644 easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/enums/DashboardLineEnum.java
 create mode 100644 easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/WorkflowJobSummarySchedule.java
 create mode 100644 frontend/src/components/Charts/WorkFlowLine.vue
 create mode 100644 frontend/src/views/dashboard/WorkFlowAnalysis.vue

diff --git a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/dataobject/JobBatchSummaryResponseDO.java b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/dataobject/JobBatchSummaryResponseDO.java
index f6209919..2a5a4637 100644
--- a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/dataobject/JobBatchSummaryResponseDO.java
+++ b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/dataobject/JobBatchSummaryResponseDO.java
@@ -29,6 +29,11 @@ public class JobBatchSummaryResponseDO {
      */
     private Long jobId;
 
+    /**
+     * 工作流任务id
+     */
+    //private Long workflowId;
+
     /**
      * 任务批次状态
      */
diff --git a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobSummaryMapper.java b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobSummaryMapper.java
index baeb84bb..2efd0326 100644
--- a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobSummaryMapper.java
+++ b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobSummaryMapper.java
@@ -25,19 +25,23 @@ public interface JobSummaryMapper extends BaseMapper<JobSummary> {
 
     IPage<DashboardRetryLineResponseDO.Task> jobTaskList(@Param("namespaceId") String namespaceId, @Param("groupNames") List<String> groupNames, Page<Object> page);
 
-    List<DashboardLineResponseDO> jobLineList(@Param("namespaceId") String namespaceId,
-                                              @Param("groupNames") List<String> groupNames,
-                                              @Param("groupName") String groupName,
-                                              @Param("type") String type,
-                                              @Param("from") LocalDateTime from,
-                                              @Param("to") LocalDateTime to);
+    List<DashboardLineResponseDO> jobLineList(
+            @Param("systemTaskType") Integer systemTaskType,
+            @Param("namespaceId") String namespaceId,
+            @Param("groupNames") List<String> groupNames,
+            @Param("groupName") String groupName,
+            @Param("dateFormat") String dateFormat,
+            @Param("from") LocalDateTime from,
+            @Param("to") LocalDateTime to);
 
-    DashboardCardResponseDO.JobTask toJobTask(@Param("namespaceId") String namespaceId, @Param("groupNames") List<String> groupNames);
-
-    List<DashboardRetryLineResponseDO.Rank> dashboardRank(@Param("namespaceId") String namespaceId,
-                                                          @Param("groupNames") List<String> groupNames,
-                                                          @Param("groupName") String groupName,
-                                                          @Param("startTime") LocalDateTime startTime,
-                                                          @Param("endTime") LocalDateTime endTime
+    List<DashboardRetryLineResponseDO.Rank> dashboardRank(
+            @Param("systemTaskType") Integer systemTaskType,
+            @Param("namespaceId") String namespaceId,
+            @Param("groupNames") List<String> groupNames,
+            @Param("groupName") String groupName,
+            @Param("startTime") LocalDateTime startTime,
+            @Param("endTime") LocalDateTime endTime
     );
+
+    DashboardCardResponseDO.JobTask toJobTask(@Param("systemTaskType") Integer systemTaskType, @Param("namespaceId") String namespaceId, @Param("groupNames") List<String> groupNames);
 }
diff --git a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobTaskBatchMapper.java b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobTaskBatchMapper.java
index 3ba0bc2b..e238f9cb 100644
--- a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobTaskBatchMapper.java
+++ b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobTaskBatchMapper.java
@@ -27,5 +27,7 @@ public interface JobTaskBatchMapper extends BaseMapper<JobTaskBatch> {
 
     List<JobBatchResponseDO> selectJobBatchListByIds(@Param("ids") List<Long> ids);
 
-    List<JobBatchSummaryResponseDO> summaryJobBatchList(@Param("type") Integer type, @Param("from") LocalDateTime todayFrom, @Param("to") LocalDateTime to);
+    List<JobBatchSummaryResponseDO> summaryJobBatchList(@Param("systemTaskType") Integer systemTaskType, @Param("from") LocalDateTime todayFrom, @Param("to") LocalDateTime to);
+
+    List<JobBatchSummaryResponseDO> summaryWorkflowTaskBatchList(@Param("from") LocalDateTime todayFrom, @Param("to") LocalDateTime to);
 }
diff --git a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/po/JobSummary.java b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/po/JobSummary.java
index e6d2a12e..71a3cbcf 100644
--- a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/po/JobSummary.java
+++ b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/po/JobSummary.java
@@ -92,4 +92,8 @@ public class JobSummary implements Serializable {
      */
     private LocalDateTime updateDt;
 
+    /**
+     * 任务类型 3、JOB任务 4、WORKFLOW任务
+     */
+    private Integer systemTaskType;
 }
diff --git a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml
index 572c6761..68cc65f7 100644
--- a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml
+++ b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml
@@ -20,7 +20,7 @@
 
     <insert id="insertOrUpdate" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO
-        job_summary (namespace_id, group_name, job_id, trigger_at,
+        job_summary (namespace_id, group_name, job_id, trigger_at, system_task_type,
         success_num,fail_num,fail_reason,stop_num,stop_reason, cancel_num,cancel_reason)
         VALUES
         <foreach collection="list" item="item" separator=",">
@@ -29,6 +29,7 @@
             #{item.groupName},
             #{item.jobId},
             #{item.triggerAt},
+            #{item.systemTaskType},
             #{item.successNum},
             #{item.failNum},
             #{item.failReason},
@@ -51,28 +52,11 @@
     <select id="jobLineList"
             resultType="com.aizuda.easy.retry.template.datasource.persistence.dataobject.DashboardLineResponseDO">
         SELECT
-        <choose>
-            <when test="type == 'DAY'">
-                DATE_FORMAT(create_dt,'%H')
-            </when>
-            <when test="type == 'WEEK'">
-                DATE_FORMAT(create_dt,'%Y-%m-%d')
-            </when>
-            <when test="type =='MONTH'">
-                DATE_FORMAT(create_dt,'%Y-%m-%d')
-            </when>
-            <when test="type == 'YEAR'">
-                DATE_FORMAT(create_dt,'%Y-%m')
-            </when>
-            <otherwise>
-                DATE_FORMAT(create_dt,'%Y-%m-%d')
-            </otherwise>
-        </choose>
-        AS createDt,
-        ifnull(SUM(success_num), 0) AS success,
-        ifnull(SUM(stop_num), 0) AS stop,
-        ifnull(SUM(cancel_num), 0) AS cancel,
-        ifnull(SUM(fail_num), 0) AS fail,
+        DATE_FORMAT(trigger_at, #{dateFormat})                         AS createDt,
+        ifnull(SUM(success_num), 0)                                    AS success,
+        ifnull(SUM(stop_num), 0)                                       AS stop,
+        ifnull(SUM(cancel_num), 0)                                     AS cancel,
+        ifnull(SUM(fail_num), 0)                                       AS fail,
         ifnull(SUM(success_num + fail_num + stop_num + cancel_num), 0) AS total
         FROM job_summary
         <where>
@@ -85,20 +69,21 @@
             <if test="groupName != null and groupName != '' ">
                 AND group_name = #{groupName}
             </if>
-            AND namespace_id = #{namespaceId} AND trigger_at BETWEEN #{from} AND #{to}
+            AND system_task_type = #{systemTaskType} AND namespace_id = #{namespaceId} AND trigger_at BETWEEN #{from} AND #{to}
         </where>
-        GROUP BY createDt
+        GROUP BY DATE_FORMAT(trigger_at, #{dateFormat})
     </select>
 
     <select id="toJobTask"
             resultType="com.aizuda.easy.retry.template.datasource.persistence.dataobject.DashboardCardResponseDO$JobTask">
-        SELECT ifnull(sum(success_num), 0) AS successNum,
+        SELECT
+        ifnull(sum(success_num), 0) AS successNum,
         ifnull(sum(stop_num), 0) AS stopNum,
         ifnull(sum(cancel_num), 0) AS cancelNum,
         ifnull(sum(fail_num), 0) AS failNum,
         ifnull(sum(success_num + fail_num + stop_num + cancel_num), 0) AS totalNum
         FROM job_summary
-        WHERE namespace_id = #{namespaceId}
+        WHERE system_task_type = #{systemTaskType} AND namespace_id = #{namespaceId}
         <if test="groupNames != null and groupNames.size > 0">
             AND group_name IN
             <foreach collection="groupNames" item="groupName" open="(" separator="," close=")">
@@ -110,7 +95,12 @@
     <select id="dashboardRank"
             resultType="com.aizuda.easy.retry.template.datasource.persistence.dataobject.DashboardRetryLineResponseDO$Rank">
         SELECT
-        CONCAT(group_name, '/', (SELECT job_name FROM job WHERE id=job_id)) `name`,
+        <if test="systemTaskType == 3">
+            CONCAT(group_name, '/', (SELECT job_name FROM job WHERE id = job_id)) `name`,
+        </if>
+        <if test="systemTaskType == 4">
+        CONCAT(group_name, '/', (SELECT workflow_name FROM workflow WHERE id = job_id)) `name`,
+        </if>
         SUM(fail_num) AS total FROM job_summary
         <where>
             <if test="groupNames != null and groupNames.size > 0">
@@ -124,6 +114,7 @@
             </if>
             AND trigger_at >= #{startTime} AND trigger_at &lt;= #{endTime}
         </where>
+        AND system_task_type = #{systemTaskType}
         AND namespace_id = #{namespaceId}
         GROUP BY namespace_id, group_name, job_id
         HAVING total > 0
diff --git a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobTaskBatchMapper.xml b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobTaskBatchMapper.xml
index 362bb68c..182bccd9 100644
--- a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobTaskBatchMapper.xml
+++ b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobTaskBatchMapper.xml
@@ -55,9 +55,25 @@
                SUM(CASE WHEN (task_batch_status = 5) THEN 1 ELSE 0 END) AS stopNum,
                SUM(CASE WHEN (task_batch_status = 4) THEN 1 ELSE 0 END) AS failNum
         FROM job_task_batch
-        WHERE system_task_type = #{type} AND create_dt BETWEEN #{from} AND #{to}
+        WHERE system_task_type = #{systemTaskType} AND create_dt BETWEEN #{from} AND #{to}
         GROUP BY namespace_id, group_name, job_id, task_batch_status, operation_reason
+    </select>
 
+    <select id="summaryWorkflowTaskBatchList"
+            resultType="com.aizuda.easy.retry.template.datasource.persistence.dataobject.JobBatchSummaryResponseDO">
+        SELECT namespace_id                                             AS namespaceId,
+               workflow_id                                              AS jobId,
+               group_name                                               AS groupName,
+               task_batch_status                                        AS taskBatchStatus,
+               operation_reason                                         AS operationReason,
+               COUNT(operation_reason)                                  AS operationReasonTotal,
+               SUM(CASE WHEN (task_batch_status = 3) THEN 1 ELSE 0 END) AS successNum,
+               SUM(CASE WHEN (task_batch_status = 6) THEN 1 ELSE 0 END) AS cancelNum,
+               SUM(CASE WHEN (task_batch_status = 5) THEN 1 ELSE 0 END) AS stopNum,
+               SUM(CASE WHEN (task_batch_status = 4) THEN 1 ELSE 0 END) AS failNum
+        FROM workflow_task_batch
+        WHERE create_dt BETWEEN #{from} AND #{to}
+        GROUP BY namespace_id, group_name, workflow_id, task_batch_status, operation_reason
     </select>
 
     <select id="selectJobBatchListByIds"
diff --git a/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/enums/DashboardLineEnum.java b/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/enums/DashboardLineEnum.java
new file mode 100644
index 00000000..70a71d65
--- /dev/null
+++ b/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/enums/DashboardLineEnum.java
@@ -0,0 +1,35 @@
+package com.aizuda.easy.retry.server.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 年、月、日
+ *
+ * @author zhengweilin
+ * @version 1.0.0
+ * @date 2024/03/26
+ */
+@AllArgsConstructor
+@Getter
+public enum DashboardLineEnum {
+
+    DAY("DAY", "%H"),
+    WEEK("WEEK", "%Y-%m-%d"),
+    MONTH("MONTH", "%Y-%m-%d"),
+    YEAR("YEAR", "%Y-%m"),
+    ;
+
+    private final String unit;
+    private final String dateFormat;
+
+    public static DashboardLineEnum modeOf(String mode) {
+        for (DashboardLineEnum value : DashboardLineEnum.values()) {
+            if (value.getUnit().equals(mode)) {
+                return value;
+            }
+        }
+
+        return DashboardLineEnum.WEEK;
+    }
+}
diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobSummarySchedule.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobSummarySchedule.java
index ed59fe73..84436f90 100644
--- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobSummarySchedule.java
+++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobSummarySchedule.java
@@ -87,6 +87,7 @@ public class JobSummarySchedule extends AbstractSchedule implements Lifecycle {
             jobSummary.setTriggerAt(triggerAt);
             jobSummary.setNamespaceId(job.getValue().get(0).getNamespaceId());
             jobSummary.setGroupName(job.getValue().get(0).getGroupName());
+            jobSummary.setSystemTaskType(SyetemTaskTypeEnum.JOB.getType());
             jobSummary.setSuccessNum(job.getValue().stream().mapToInt(JobBatchSummaryResponseDO::getSuccessNum).sum());
             jobSummary.setFailNum(job.getValue().stream().mapToInt(JobBatchSummaryResponseDO::getFailNum).sum());
             jobSummary.setStopNum(job.getValue().stream().mapToInt(JobBatchSummaryResponseDO::getStopNum).sum());
diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/WorkflowJobSummarySchedule.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/WorkflowJobSummarySchedule.java
new file mode 100644
index 00000000..8dc6349a
--- /dev/null
+++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/WorkflowJobSummarySchedule.java
@@ -0,0 +1,135 @@
+package com.aizuda.easy.retry.server.job.task.support.schedule;
+
+import com.aizuda.easy.retry.common.core.enums.JobTaskBatchStatusEnum;
+import com.aizuda.easy.retry.common.core.util.JsonUtil;
+import com.aizuda.easy.retry.common.log.EasyRetryLog;
+import com.aizuda.easy.retry.server.common.Lifecycle;
+import com.aizuda.easy.retry.server.common.config.SystemProperties;
+import com.aizuda.easy.retry.server.common.dto.JobTaskBatchReason;
+import com.aizuda.easy.retry.server.common.enums.SyetemTaskTypeEnum;
+import com.aizuda.easy.retry.server.common.schedule.AbstractSchedule;
+import com.aizuda.easy.retry.template.datasource.persistence.dataobject.JobBatchSummaryResponseDO;
+import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobSummaryMapper;
+import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobTaskBatchMapper;
+import com.aizuda.easy.retry.template.datasource.persistence.po.JobSummary;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * Job Dashboard
+ *
+ * @author: wodeyangzipingpingwuqi
+ * @date : 2024-03-25 10:16
+ * @since 3.2.0
+ */
+@Component
+@Slf4j
+public class WorkflowJobSummarySchedule extends AbstractSchedule implements Lifecycle {
+
+    @Autowired
+    private JobTaskBatchMapper jobTaskBatchMapper;
+    @Autowired
+    private JobSummaryMapper jobSummaryMapper;
+    @Autowired
+    private SystemProperties systemProperties;
+
+    @Override
+    public String lockName() {
+        return "workflowJobSummarySchedule";
+    }
+
+    @Override
+    public String lockAtMost() {
+        return "PT1M";
+    }
+
+    @Override
+    public String lockAtLeast() {
+        return "PT20S";
+    }
+
+    @Override
+    protected void doExecute() {
+        try {
+            for (int i = 0; i < systemProperties.getSummaryDay(); i++) {
+
+                // 定时按日实时查询统计数据（00:00:00 - 23:59:59）
+                LocalDateTime todayFrom = LocalDateTime.of(LocalDate.now(), LocalTime.MIN).plusDays(-i);
+                LocalDateTime todayTo = LocalDateTime.of(LocalDate.now(), LocalTime.MAX).plusDays(-i);
+                List<JobBatchSummaryResponseDO> summaryWorkflowResponseDOList = jobTaskBatchMapper.summaryWorkflowTaskBatchList(todayFrom, todayTo);
+                if (summaryWorkflowResponseDOList == null || summaryWorkflowResponseDOList.size() < 1) {
+                    continue;
+                }
+
+                // insertOrUpdate
+                List<JobSummary> jobSummaryList = jobSummaryList(todayFrom, summaryWorkflowResponseDOList);
+                int totalJobSummary = jobSummaryMapper.insertOrUpdate(jobSummaryList);
+                EasyRetryLog.LOCAL.debug("workflow job summary dashboard success todayFrom:[{}] todayTo:[{}] total:[{}]", todayFrom, todayTo, totalJobSummary);
+            }
+        } catch (Exception e) {
+            EasyRetryLog.LOCAL.error("workflow job summary dashboard log error", e);
+        }
+    }
+
+    private List<JobSummary> jobSummaryList(LocalDateTime triggerAt, List<JobBatchSummaryResponseDO> summaryResponseDOList) {
+        List<JobSummary> jobSummaryList = new ArrayList<>();
+        Map<Long, List<JobBatchSummaryResponseDO>> jobIdListMap = summaryResponseDOList.parallelStream().collect(Collectors.groupingBy(JobBatchSummaryResponseDO::getJobId));
+        for (Map.Entry<Long, List<JobBatchSummaryResponseDO>> job : jobIdListMap.entrySet()) {
+            JobSummary jobSummary = new JobSummary();
+            jobSummary.setJobId(job.getKey());
+            jobSummary.setTriggerAt(triggerAt);
+            jobSummary.setNamespaceId(job.getValue().get(0).getNamespaceId());
+            jobSummary.setGroupName(job.getValue().get(0).getGroupName());
+            jobSummary.setSystemTaskType(SyetemTaskTypeEnum.WORKFLOW.getType());
+            jobSummary.setSuccessNum(job.getValue().stream().mapToInt(JobBatchSummaryResponseDO::getSuccessNum).sum());
+            jobSummary.setFailNum(job.getValue().stream().mapToInt(JobBatchSummaryResponseDO::getFailNum).sum());
+            jobSummary.setStopNum(job.getValue().stream().mapToInt(JobBatchSummaryResponseDO::getStopNum).sum());
+            jobSummary.setCancelNum(job.getValue().stream().mapToInt(JobBatchSummaryResponseDO::getCancelNum).sum());
+
+            jobSummary.setFailReason(JsonUtil.toJsonString(jobTaskBatchReasonList(JobTaskBatchStatusEnum.FAIL.getStatus(), job.getValue())));
+            jobSummary.setStopReason(JsonUtil.toJsonString(jobTaskBatchReasonList(JobTaskBatchStatusEnum.STOP.getStatus(), job.getValue())));
+            jobSummary.setCancelReason(JsonUtil.toJsonString(jobTaskBatchReasonList(JobTaskBatchStatusEnum.CANCEL.getStatus(), job.getValue())));
+            jobSummaryList.add(jobSummary);
+        }
+        return jobSummaryList;
+    }
+
+    /**
+     * 批次状态查询 (操作原因 && 总数)
+     *
+     * @param jobTaskBatchStatus
+     * @param jobBatchSummaryResponseDOList
+     * @return
+     */
+    private List<JobTaskBatchReason> jobTaskBatchReasonList(int jobTaskBatchStatus, List<JobBatchSummaryResponseDO> jobBatchSummaryResponseDOList) {
+        List<JobTaskBatchReason> jobTaskBatchReasonArrayList = new ArrayList<>();
+        List<JobBatchSummaryResponseDO> summaryResponseDOList = jobBatchSummaryResponseDOList.stream().filter(i -> jobTaskBatchStatus == i.getTaskBatchStatus()).collect(Collectors.toList());
+        for (JobBatchSummaryResponseDO jobBatchSummaryResponseDO : summaryResponseDOList) {
+            JobTaskBatchReason jobTaskBatchReason = new JobTaskBatchReason();
+            jobTaskBatchReason.setReason(jobBatchSummaryResponseDO.getOperationReason());
+            jobTaskBatchReason.setTotal(jobBatchSummaryResponseDO.getOperationReasonTotal());
+            jobTaskBatchReasonArrayList.add(jobTaskBatchReason);
+        }
+        return jobTaskBatchReasonArrayList;
+    }
+
+    @Override
+    public void start() {
+        taskScheduler.scheduleAtFixedRate(this::execute, Duration.parse("PT1H"));
+    }
+
+    @Override
+    public void close() {
+
+    }
+}
diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/DashBoardController.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/DashBoardController.java
index 2f2a9c33..2cf69fbf 100644
--- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/DashBoardController.java
+++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/DashBoardController.java
@@ -51,12 +51,13 @@ public class DashBoardController {
     @LoginRequired
     @GetMapping("/job/line")
     public DashboardRetryLineResponseVO jobLineList(BaseQueryVO baseQueryVO,
+                                                    @RequestParam(value = "mode", required = false) String mode,
                                                     @RequestParam(value = "groupName", required = false) String groupName,
                                                     @RequestParam(value = "type", required = false, defaultValue = "WEEK") String type,
                                                     @RequestParam(value = "startTime", required = false) String startTime,
                                                     @RequestParam(value = "endTime", required = false) String endTime
     ) {
-        return dashBoardService.jobLineList(baseQueryVO, groupName, type, startTime, endTime);
+        return dashBoardService.jobLineList(baseQueryVO, mode, groupName, type, startTime, endTime);
     }
 
     @LoginRequired
diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/response/DashboardCardResponseVO.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/response/DashboardCardResponseVO.java
index cc90c5e4..222cf119 100644
--- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/response/DashboardCardResponseVO.java
+++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/response/DashboardCardResponseVO.java
@@ -18,6 +18,11 @@ public class DashboardCardResponseVO {
      */
     private JobTask jobTask;
 
+    /**
+     * 工作流任务
+     */
+    private WorkFlowTask workFlowTask;
+
     /**
      * 重试任务
      */
@@ -77,6 +82,22 @@ public class DashboardCardResponseVO {
         private BigDecimal successRate;
     }
 
+    @Data
+    public static class WorkFlowTask {
+        //成功
+        private Integer successNum;
+        //失败
+        private Integer failNum;
+        //取消
+        private Integer cancelNum;
+        //停止
+        private Integer stopNum;
+        // 总数
+        private Integer totalNum;
+        // 成功率
+        private BigDecimal successRate;
+    }
+
     @Data
     @Accessors(chain = true)
     public static class RetryTaskBar {
diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/DashBoardService.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/DashBoardService.java
index 61515ccf..21581422 100644
--- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/DashBoardService.java
+++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/DashBoardService.java
@@ -19,7 +19,7 @@ public interface DashBoardService {
 
     DashboardRetryLineResponseVO retryLineList(BaseQueryVO baseQueryVO, String groupName, String type, String startTime, String endTime);
 
-    DashboardRetryLineResponseVO jobLineList(BaseQueryVO baseQueryVO, String groupName, String type, String startTime, String endTime);
+    DashboardRetryLineResponseVO jobLineList(BaseQueryVO baseQueryVO, String mode, String groupName, String type, String startTime, String endTime);
 
     PageResult<List<ServerNodeResponseVO>> pods(ServerNodeQueryVO serverNodeQueryVO);
 }
diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/convert/JobSummaryResponseVOConverter.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/convert/JobSummaryResponseVOConverter.java
index 77175967..f76862c6 100644
--- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/convert/JobSummaryResponseVOConverter.java
+++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/convert/JobSummaryResponseVOConverter.java
@@ -29,6 +29,11 @@ public interface JobSummaryResponseVOConverter {
     })
     DashboardCardResponseVO.JobTask toTaskJob(DashboardCardResponseDO.JobTask jobTask);
 
+    @Mappings({
+            @Mapping(target = "successRate", expression = "java(JobSummaryResponseVOConverter.toSuccessRate(jobTask.getSuccessNum(), jobTask.getTotalNum()))")
+    })
+    DashboardCardResponseVO.WorkFlowTask toWorkFlowTask(DashboardCardResponseDO.JobTask jobTask);
+
     List<DashboardRetryLineResponseVO.Task> toDashboardRetryLineResponseVO(List<DashboardRetryLineResponseDO.Task> taskList);
 
     static BigDecimal toSuccessRate(Integer successNum, Integer totalNum) {
diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/DashBoardServiceImpl.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/DashBoardServiceImpl.java
index ae5b916d..b41e1e5f 100644
--- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/DashBoardServiceImpl.java
+++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/DashBoardServiceImpl.java
@@ -9,6 +9,9 @@ import com.aizuda.easy.retry.common.log.EasyRetryLog;
 import com.aizuda.easy.retry.server.common.config.SystemProperties;
 import com.aizuda.easy.retry.server.common.dto.DistributeInstance;
 import com.aizuda.easy.retry.server.common.dto.ServerNodeExtAttrs;
+import com.aizuda.easy.retry.server.common.enums.DashboardLineEnum;
+import com.aizuda.easy.retry.server.common.enums.SyetemTaskTypeEnum;
+import com.aizuda.easy.retry.server.common.enums.SystemModeEnum;
 import com.aizuda.easy.retry.server.common.register.ServerRegister;
 import com.aizuda.easy.retry.server.web.model.base.BaseQueryVO;
 import com.aizuda.easy.retry.server.web.model.base.PageResult;
@@ -77,9 +80,17 @@ public class DashBoardServiceImpl implements DashBoardService {
         List<String> groupNames = userSessionVO.isUser() ? userSessionVO.getGroupNames() : new ArrayList<>();
         DashboardCardResponseVO dashboardCardResponseVO = new DashboardCardResponseVO();
         // 重试任务
-        dashboardCardResponseVO.setRetryTask(RetrySummaryResponseVOConverter.INSTANCE.toRetryTask(retrySummaryMapper.retryTask(namespaceId, groupNames)));
+        DashboardCardResponseDO.RetryTask retryTaskDO = retrySummaryMapper.retryTask(namespaceId, groupNames);
+        DashboardCardResponseVO.RetryTask retryTaskVO = RetrySummaryResponseVOConverter.INSTANCE.toRetryTask(retryTaskDO);
+        dashboardCardResponseVO.setRetryTask(retryTaskVO);
         // 定时任务
-        dashboardCardResponseVO.setJobTask(JobSummaryResponseVOConverter.INSTANCE.toTaskJob(jobSummaryMapper.toJobTask(namespaceId, groupNames)));
+        DashboardCardResponseDO.JobTask jobTaskDO = jobSummaryMapper.toJobTask(SyetemTaskTypeEnum.JOB.getType(), namespaceId, groupNames);
+        DashboardCardResponseVO.JobTask jobTaskVO = JobSummaryResponseVOConverter.INSTANCE.toTaskJob(jobTaskDO);
+        dashboardCardResponseVO.setJobTask(jobTaskVO);
+        // 工作流任务
+        DashboardCardResponseDO.JobTask workFlowTaskDO = jobSummaryMapper.toJobTask(SyetemTaskTypeEnum.WORKFLOW.getType(), namespaceId, groupNames);
+        DashboardCardResponseVO.WorkFlowTask workFlowTaskVO = JobSummaryResponseVOConverter.INSTANCE.toWorkFlowTask(workFlowTaskDO);
+        dashboardCardResponseVO.setWorkFlowTask(workFlowTaskVO);
         // 重试任务柱状图
         HashMap<LocalDateTime, DashboardCardResponseVO.RetryTaskBar> retryTaskBarMap = new HashMap<>();
         for (int i = 0; i < 7; i++) {
@@ -89,7 +100,7 @@ public class DashBoardServiceImpl implements DashBoardService {
 
         List<DashboardCardResponseDO.RetryTask> retryTaskList = retrySummaryMapper.retryTaskBarList(namespaceId, groupNames);
         Map<LocalDateTime, LongSummaryStatistics> summaryStatisticsMap = retryTaskList.stream().collect(Collectors.groupingBy(DashboardCardResponseDO.RetryTask::getTriggerAt,
-            Collectors.summarizingLong(i -> i.getMaxCountNum() + i.getRunningNum() + i.getSuspendNum() + i.getFinishNum())));
+                Collectors.summarizingLong(i -> i.getMaxCountNum() + i.getRunningNum() + i.getSuspendNum() + i.getFinishNum())));
         for (Map.Entry<LocalDateTime, LongSummaryStatistics> map : summaryStatisticsMap.entrySet()) {
             if (retryTaskBarMap.containsKey(LocalDateTime.of(map.getKey().toLocalDate(), LocalTime.MIN))) {
                 DashboardCardResponseVO.RetryTaskBar retryTaskBar = retryTaskBarMap.get(LocalDateTime.of(map.getKey().toLocalDate(), LocalTime.MIN));
@@ -146,7 +157,7 @@ public class DashBoardServiceImpl implements DashBoardService {
     }
 
     @Override
-    public DashboardRetryLineResponseVO jobLineList(BaseQueryVO baseQueryVO, String groupName, String type, String startTime, String endTime) {
+    public DashboardRetryLineResponseVO jobLineList(BaseQueryVO baseQueryVO, String mode, String groupName, String type, String startTime, String endTime) {
 
         // 查询登录用户权限
         UserSessionVO userSessionVO = UserSessionUtils.currentUserSession();
@@ -159,6 +170,8 @@ public class DashBoardServiceImpl implements DashBoardService {
         if (DbTypeEnum.SQLSERVER.equals(systemProperties.getDbType())) {
             pager.setCountId("sqlServer_jobTaskList_Count");
         }
+        // 任务类型
+        Integer systemTaskType = SystemModeEnum.JOB.name().equals(mode) ? SyetemTaskTypeEnum.JOB.getType() : SyetemTaskTypeEnum.WORKFLOW.getType();
         IPage<DashboardRetryLineResponseDO.Task> IPage = jobSummaryMapper.jobTaskList(namespaceId, groupNames, pager);
         List<DashboardRetryLineResponseVO.Task> taskList = JobSummaryResponseVOConverter.INSTANCE.toDashboardRetryLineResponseVO(IPage.getRecords());
         PageResult<List<DashboardRetryLineResponseVO.Task>> pageResult = new PageResult<>(new PageDTO(IPage.getCurrent(), IPage.getSize(), IPage.getTotal()), taskList);
@@ -168,14 +181,14 @@ public class DashBoardServiceImpl implements DashBoardService {
         DateTypeEnum dateTypeEnum = DateTypeEnum.valueOf(type);
         LocalDateTime startDateTime = dateTypeEnum.getStartTime().apply(StrUtil.isNotBlank(startTime) ? LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) : null);
         LocalDateTime endDateTime = dateTypeEnum.getEndTime().apply(StrUtil.isNotBlank(endTime) ? LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) : null);
-        List<DashboardLineResponseDO> dashboardLineResponseDOList = jobSummaryMapper.jobLineList(namespaceId, groupNames, groupName, type, startDateTime, endDateTime);
+        List<DashboardLineResponseDO> dashboardLineResponseDOList = jobSummaryMapper.jobLineList(systemTaskType, namespaceId, groupNames, groupName, DashboardLineEnum.modeOf(type).getDateFormat(), startDateTime, endDateTime);
         List<DashboardLineResponseVO> dashboardLineResponseVOList = DispatchQuantityResponseVOConverter.INSTANCE.toDashboardLineResponseVO(dashboardLineResponseDOList);
         dateTypeEnum.getConsumer().accept(dashboardLineResponseVOList);
         dashboardLineResponseVOList.sort(Comparator.comparing(a -> a.getCreateDt()));
         dashboardRetryLineResponseVO.setDashboardLineResponseDOList(dashboardLineResponseVOList);
 
         // 排行榜
-        List<DashboardRetryLineResponseDO.Rank> rankList = jobSummaryMapper.dashboardRank(namespaceId, groupNames, groupName, startDateTime, endDateTime);
+        List<DashboardRetryLineResponseDO.Rank> rankList = jobSummaryMapper.dashboardRank(systemTaskType, namespaceId, groupNames, groupName, startDateTime, endDateTime);
         List<DashboardRetryLineResponseVO.Rank> ranks = SceneQuantityRankResponseVOConverter.INSTANCE.toDashboardRetryLineResponseVORank(rankList);
         dashboardRetryLineResponseVO.setRankList(ranks);
         return dashboardRetryLineResponseVO;
@@ -187,7 +200,7 @@ public class DashBoardServiceImpl implements DashBoardService {
 
         LambdaQueryWrapper<ServerNode> serverNodeLambdaQueryWrapper = new LambdaQueryWrapper<>();
         serverNodeLambdaQueryWrapper.in(ServerNode::getNamespaceId, Lists.newArrayList(
-            UserSessionUtils.currentUserSession().getNamespaceId(), ServerRegister.NAMESPACE_ID
+                UserSessionUtils.currentUserSession().getNamespaceId(), ServerRegister.NAMESPACE_ID
         ));
         if (StrUtil.isNotBlank(queryVO.getGroupName())) {
             serverNodeLambdaQueryWrapper.eq(ServerNode::getGroupName, queryVO.getGroupName());
@@ -219,8 +232,8 @@ public class DashBoardServiceImpl implements DashBoardService {
                 List<Integer> data = result.getData();
                 if (!CollectionUtils.isEmpty(data)) {
                     serverNodeResponseVO.setConsumerBuckets(data.stream()
-                        .sorted(Integer::compareTo)
-                        .collect(Collectors.toCollection(LinkedHashSet::new)));
+                            .sorted(Integer::compareTo)
+                            .collect(Collectors.toCollection(LinkedHashSet::new)));
                 }
             } catch (Exception e) {
                 EasyRetryLog.LOCAL.error("Failed to retrieve consumer group for node [{}:{}].", serverNodeResponseVO.getHostIp(), serverNodeExtAttrs.getWebPort());
diff --git a/frontend/src/components/Charts/JobLine.vue b/frontend/src/components/Charts/JobLine.vue
index 920f4a62..a70df963 100644
--- a/frontend/src/components/Charts/JobLine.vue
+++ b/frontend/src/components/Charts/JobLine.vue
@@ -20,14 +20,15 @@ export default {
     }
   },
   mounted () {
-    this.getDashboardJobLine()
+    this.getDashboardJobLine('JOB', '')
     this.createView()
   },
   methods: {
-    getDashboardJobLine (groupName, type = 'WEEK', startTime, endTime) {
+    getDashboardJobLine (mode, groupName, type = 'WEEK', startTime, endTime) {
       getDashboardJobLine({
-        'groupName': groupName,
+        'mode': mode,
         'type': type,
+        'groupName': groupName,
         'startTime': startTime,
         'endTime': endTime
       }).then(res => {
diff --git a/frontend/src/components/Charts/WorkFlowLine.vue b/frontend/src/components/Charts/WorkFlowLine.vue
new file mode 100644
index 00000000..6ee13f0e
--- /dev/null
+++ b/frontend/src/components/Charts/WorkFlowLine.vue
@@ -0,0 +1,88 @@
+<template>
+  <div>
+    <div id="workFlowViewData"></div>
+  </div>
+</template>
+
+<script>
+import * as G2 from '@antv/g2'
+import { getDashboardJobLine } from '@/api/manage'
+
+const DataSet = require('@antv/data-set')
+
+export default {
+  name: 'WorkFlowLine',
+  data () {
+    return {
+      viewRecords: [],
+      dashboardLineResponseDOList: [],
+      chart: null
+    }
+  },
+  mounted () {
+    this.getDashboardJobLine('WORKFLOW', '')
+    this.createView()
+  },
+  methods: {
+    getDashboardJobLine (mode, groupName, type = 'WEEK', startTime, endTime) {
+      getDashboardJobLine({
+        'mode': mode,
+        'type': type,
+        'groupName': groupName,
+        'startTime': startTime,
+        'endTime': endTime
+      }).then(res => {
+        this.$bus.$emit('WORKFLOW', res)
+        this.viewCharts(res.data.dashboardLineResponseDOList)
+      })
+    },
+    viewCharts (viewRecords, type = 'WEEK') {
+      var ds = new DataSet()
+      if (viewRecords === undefined || viewRecords === null) {
+        return
+      }
+      var dv = ds.createView().source(viewRecords)
+      dv.transform({
+        type: 'fold',
+        fields: ['success', 'fail', 'stop', 'cancel'],
+        key: 'name',
+        value: 'viewTotal',
+        retains: ['total', 'createDt']
+      })
+
+      this.chart.source(dv, {
+        date: {
+          type: 'cat'
+        }
+      })
+      this.chart.axis('viewTotal', {
+        label: {
+          textStyle: {
+            fill: '#aaaaaa'
+          }
+        }
+      })
+      this.chart.tooltip({
+        crosshairs: {
+          type: 'line'
+        }
+      })
+      this.chart.line().position('createDt*viewTotal').color('name', ['#1890ff', '#c28c62']).shape('smooth')
+      this.chart.point().position('createDt*viewTotal').color('name', ['#1890ff', '#c28c62']).size(4).shape('circle').style({
+        stroke: '#fff',
+        lineWidth: 1
+      })
+
+      this.chart.render()
+    },
+    createView () {
+      this.chart = new G2.Chart({
+        container: 'workFlowViewData',
+        forceFit: true,
+        height: 410,
+        padding: [20, 90, 60, 50]
+      })
+    }
+  }
+}
+</script>
diff --git a/frontend/src/locales/lang/zh-CN/dashboard/analysis.js b/frontend/src/locales/lang/zh-CN/dashboard/analysis.js
index d73a2bde..490ca366 100644
--- a/frontend/src/locales/lang/zh-CN/dashboard/analysis.js
+++ b/frontend/src/locales/lang/zh-CN/dashboard/analysis.js
@@ -8,6 +8,7 @@ export default {
   'dashboard.analysis.job_stop': '停止',
   'dashboard.analysis.job_cancel': '取消',
   'dashboard.analysis.visits': '定时任务',
+  'dashboard.analysis.work-flow-job': '工作流任务',
   'dashboard.analysis.visits-trend': '访问量趋势',
   'dashboard.analysis.visits-ranking': '门店访问量排名',
   'dashboard.analysis.day-visits': '日访问量',
diff --git a/frontend/src/views/dashboard/Analysis.vue b/frontend/src/views/dashboard/Analysis.vue
index 5310f0c8..07a03e5d 100644
--- a/frontend/src/views/dashboard/Analysis.vue
+++ b/frontend/src/views/dashboard/Analysis.vue
@@ -58,27 +58,27 @@
       </a-col>
 
       <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="工作流任务" :total="jobTask.totalNum"><!-- -->
+        <chart-card :loading="loading" title="工作流任务" :total="workFlowTask.totalNum"><!-- -->
           <a-tooltip title="成功率:总完成/总调度量;" slot="action">
             <a-icon type="info-circle-o" />
           </a-tooltip>
           <div>
             <a-tooltip title="成功率">
-              <a-progress stroke-linecap="square" :percent="jobTask.successRate" />
+              <a-progress stroke-linecap="square" :percent="workFlowTask.successRate" />
             </a-tooltip>
           </div>
           <template slot="footer">
             {{ $t('dashboard.analysis.job_success') }}
-            <span>{{ jobTask.successNum }}</span>
+            <span>{{ workFlowTask.successNum }}</span>
             <a-divider type="vertical" />
             {{ $t('dashboard.analysis.job_fail') }}
-            <span>{{ jobTask.failNum }}</span>
+            <span>{{ workFlowTask.failNum }}</span>
             <a-divider type="vertical" />
             {{ $t('dashboard.analysis.job_stop') }}
-            <span>{{ jobTask.stopNum }}</span>
+            <span>{{ workFlowTask.stopNum }}</span>
             <a-divider type="vertical" />
             {{ $t('dashboard.analysis.job_cancel') }}
-            <span>{{ jobTask.cancelNum }}</span>
+            <span>{{ workFlowTask.cancelNum }}</span>
           </template>
         </chart-card>
       </a-col>
@@ -130,6 +130,11 @@
               <job-analysis ref="jobAnalysisRef"/>
             </div>
           </a-tab-pane>
+          <a-tab-pane :tab="$t('dashboard.analysis.work-flow-job')" key="WORKFLOW">
+            <div>
+              <work-flow-analysis ref="workFlowAnalysisRef"/>
+            </div>
+          </a-tab-pane>
         </a-tabs>
       </div>
     </a-card>
@@ -150,6 +155,7 @@ import {
 import { getAllGroupNameList, getDashboardTaskRetryJob } from '@/api/manage'
 import RetryAnalysis from '@/views/dashboard/RetryAnalysis.vue'
 import JobAnalysis from '@/views/dashboard/JobAnalysis.vue'
+import WorkFlowAnalysis from '@/views/dashboard/WorkFlowAnalysis.vue'
 import { APP_MODE } from '@/store/mutation-types'
 import storage from 'store'
 import moment from 'moment'
@@ -159,6 +165,7 @@ export default {
   components: {
     RetryAnalysis,
     JobAnalysis,
+    WorkFlowAnalysis,
     ChartCard,
     MiniArea,
     MiniProgress,
@@ -190,6 +197,14 @@ export default {
         stopNum: 0,
         totalNum: 0
       },
+      workFlowTask: {
+        successRate: 0,
+        successNum: 0,
+        failNum: 0,
+        cancelNum: 0,
+        stopNum: 0,
+        totalNum: 0
+      },
       onLineService: {
         clientTotal: 0,
         serverTotal: 0,
@@ -209,20 +224,39 @@ export default {
     },
     dataHandler (type) {
       this.type = type
-      this.mode === 'ALL' || this.mode === 'RETRY' ? this.$refs.retryAnalysisRef.dataHandler(this.type) : this.$refs.jobAnalysisRef.dataHandler(this.type)
+      if (this.mode === 'ALL' || this.mode === 'RETRY') {
+        this.$refs.retryAnalysisRef.dataHandler(this.type)
+      } else if (this.mode === 'JOB') {
+        this.$refs.jobAnalysisRef.dataHandler(this.mode, this.type)
+      } else if (this.mode === 'WORKFLOW') {
+        this.$refs.workFlowAnalysisRef.dataHandler(this.mode, this.type)
+      }
     },
     dateChange (date, dateString) {
-      this.mode === 'ALL' || this.mode === 'RETRY' ? this.$refs.retryAnalysisRef.dateChange(date, dateString) : this.$refs.jobAnalysisRef.dateChange(date, dateString)
+      if (this.mode === 'ALL' || this.mode === 'RETRY') {
+        this.$refs.retryAnalysisRef.dateChange(date, dateString)
+      } else if (this.mode === 'JOB') {
+        this.$refs.jobAnalysisRef.dateChange(this.mode, date, dateString)
+      } else if (this.mode === 'WORKFLOW') {
+        this.$refs.workFlowAnalysisRef.dateChange(this.mode, date, dateString)
+      }
     },
     handleChange (value) {
-      this.mode === 'ALL' || this.mode === 'RETRY' ? this.$refs.retryAnalysisRef.handleChange(value) : this.$refs.jobAnalysisRef.handleChange(value)
+      if (this.mode === 'ALL' || this.mode === 'RETRY') {
+        this.$refs.retryAnalysisRef.handleChange(value)
+      } else if (this.mode === 'JOB') {
+        this.$refs.jobAnalysisRef.handleChange(this.mode, value)
+      } else if (this.mode === 'WORKFLOW') {
+        this.$refs.workFlowAnalysisRef.handleChange(this.mode, value)
+      }
     }
   },
   created () {
     this.mode = storage.get(APP_MODE)
     getDashboardTaskRetryJob().then(res => {
-      this.retryTask = res.data.retryTask
       this.jobTask = res.data.jobTask
+      this.retryTask = res.data.retryTask
+      this.workFlowTask = res.data.workFlowTask
       this.onLineService = res.data.onLineService
       this.retryTaskBarList = res.data.retryTaskBarList
     })
diff --git a/frontend/src/views/dashboard/JobAnalysis.vue b/frontend/src/views/dashboard/JobAnalysis.vue
index 13c5ade3..eb8721d8 100644
--- a/frontend/src/views/dashboard/JobAnalysis.vue
+++ b/frontend/src/views/dashboard/JobAnalysis.vue
@@ -68,6 +68,7 @@ export default {
       dashboardLineResponseDOList: [],
       type: 'WEEK',
       groupName: '',
+      mode: '',
       startTime: '',
       endTime: '',
       success: 0,
@@ -134,19 +135,22 @@ export default {
   },
   methods: {
     moment,
-    dataHandler (type) {
+    dataHandler (mode, type) {
+      this.mode = mode
       this.type = type
-      this.$refs.jobViewChart.getDashboardJobLine(this.groupName, this.type, this.startTime, this.endTime)
+      this.$refs.jobViewChart.getDashboardJobLine(this.mode, this.groupName, this.type, this.startTime, this.endTime)
     },
-    handleChange (value) {
+    handleChange (mode, value) {
+      this.mode = mode
       this.groupName = value
-      this.$refs.jobViewChart.getDashboardJobLine(this.groupName, this.type, this.startTime, this.endTime)
+      this.$refs.jobViewChart.getDashboardJobLine(this.mode, this.groupName, this.type, this.startTime, this.endTime)
     },
-    dateChange (date, dateString) {
+    dateChange (mode, date, dateString) {
+      this.mode = mode
       this.startTime = dateString[0]
       this.endTime = dateString[1]
       this.type = this.startTime === '' ? 'WEEK' : 'OTHERS'
-      this.$refs.jobViewChart.getDashboardJobLine(this.groupName, this.type, this.startTime, this.endTime)
+      this.$refs.jobViewChart.getDashboardJobLine(this.mode, this.groupName, this.type, this.startTime, this.endTime)
     }
   },
   created () {
diff --git a/frontend/src/views/dashboard/WorkFlowAnalysis.vue b/frontend/src/views/dashboard/WorkFlowAnalysis.vue
new file mode 100644
index 00000000..0061f4a8
--- /dev/null
+++ b/frontend/src/views/dashboard/WorkFlowAnalysis.vue
@@ -0,0 +1,170 @@
+<template>
+  <div class="antd-pro-pages-dashboard-analysis-twoColLayout" :class="!isMobile && 'desktop'">
+    <a-row>
+      <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
+        <g2-work-flow-line ref="workFlowViewChart" name="G2WorkFlowLine" />
+      </a-col>
+      <a-col :xl="8" :lg="12" :md="12" :sm="24" :xs="24">
+        <rank-list title="失败任务排名" :list="rankList" />
+      </a-col>
+    </a-row>
+    <a-row :gutter="24" type="flex" :style="{ marginTop: '24px' }">
+      <a-col :xl="12" :lg="24" :md="24" :sm="24" :xs="24">
+        <a-card :loading="loading" :bordered="false" :title="$t('dashboard.analysis.online-top-search')" :style="{ height: '100%' }">
+          <s-table
+            ref="table"
+            size="default"
+            :rowKey="(record,index) => index"
+            :columns="columns"
+            :data="loadData"
+            :scroll="{ x: 200 }"
+          >
+          </s-table>
+        </a-card>
+      </a-col>
+      <a-col :xl="12" :lg="24" :md="24" :sm="24" :xs="24">
+        <a-card class="antd-pro-pages-dashboard-analysis-salesCard" :loading="loading" :bordered="false" :title="$t('dashboard.analysis.the-proportion-of-sales')" :style="{ height: '100%' }">
+          <h4>{{ $t('dashboard.analysis.job.sales') }}</h4>
+          <div>
+            <div>
+              <v-chart :force-fit="true" :height="405" :data="pieData" :scale="pieScale" >
+                <v-tooltip :showTitle="false" dataKey="value*percent" />
+                <v-axis />
+                <v-legend dataKey="value" />
+                <v-pie position="percent" color="value" :vStyle="pieStyle" />
+                <v-coord type="theta" :radius="0.95" :innerRadius="0.7" />
+              </v-chart>
+            </div>
+          </div>
+        </a-card>
+      </a-col>
+    </a-row>
+  </div>
+</template>
+
+<script>
+import {
+  RankList,
+  STable
+} from '@/components'
+import { getAllGroupNameList, getDashboardJobLine } from '@/api/manage'
+import { baseMixin } from '@/store/app-mixin'
+import G2WorkFlowLine from '@/components/Charts/WorkFlowLine.vue'
+import moment from 'moment'
+
+export default {
+  name: 'WorkFlowAnalysis',
+  mixins: [ baseMixin ],
+  components: {
+    G2WorkFlowLine,
+    RankList,
+    STable
+  },
+  data () {
+    return {
+      loading: true,
+      rankList: [],
+      taskList: [],
+      dashboardLineResponseDOList: [],
+      type: 'WEEK',
+      groupName: '',
+      mode: '',
+      startTime: '',
+      endTime: '',
+      success: 0,
+      fail: 0,
+      stop: 0,
+      cancel: 0,
+      total: 0,
+      groupNameList: [],
+      pieScale: [{
+        dataKey: 'percent',
+        min: 0,
+        formatter: '.0%'
+      }],
+      pieData: [],
+      pieStyle: {
+        stroke: '#fff',
+        lineWidth: 1
+      },
+      columns: [
+        {
+          title: '组名称',
+          dataIndex: 'groupName'
+        },
+        {
+          title: '运行中任务数',
+          dataIndex: 'run'
+        },
+        {
+          title: '总任务数',
+          dataIndex: 'total'
+        }
+      ],
+      loadData: (parameter) => {
+        return getDashboardJobLine(Object.assign(parameter)).then((res) => {
+          this.rankList = res.data.rankList
+          return res.data.taskList
+        })
+      }
+    }
+  },
+  mounted () {
+    this.$bus.$on('WORKFLOW', (res) => {
+      this.total = 0
+      this.success = 0
+      this.fail = 0
+      this.stop = 0
+      this.cancel = 0
+      this.rankList = res.data.rankList
+      this.taskList = res.data.taskList
+      res.data.dashboardLineResponseDOList.forEach(res => {
+        this.success += res.success
+        this.fail += res.fail
+        this.stop += res.stop
+        this.cancel += res.cancel
+      })
+      this.total = this.success + this.fail + this.stop + this.cancel
+      this.pieData = [
+        { value: 'SUCCESS', name: this.success, percent: this.success / this.total },
+        { value: 'FAIL', name: this.fail, percent: this.fail / this.total },
+        { value: 'STOP', name: this.stop, percent: this.stop / this.total },
+        { value: 'CANCEL', name: this.cancel, percent: this.cancel / this.total }
+      ]
+    })
+  },
+  methods: {
+    moment,
+    dataHandler (mode, type) {
+      this.mode = mode
+      this.type = type
+      this.$refs.workFlowViewChart.getDashboardJobLine(this.mode, this.groupName, this.type, this.startTime, this.endTime)
+    },
+    handleChange (mode, value) {
+      this.mode = mode
+      this.groupName = value
+      this.$refs.workFlowViewChart.getDashboardJobLine(this.mode, this.groupName, this.type, this.startTime, this.endTime)
+    },
+    dateChange (mode, date, dateString) {
+      this.mode = mode
+      this.startTime = dateString[0]
+      this.endTime = dateString[1]
+      this.type = this.startTime === '' ? 'WEEK' : 'OTHERS'
+      this.$refs.workFlowViewChart.getDashboardJobLine(this.mode, this.groupName, this.type, this.startTime, this.endTime)
+    }
+  },
+  created () {
+    getAllGroupNameList().then(res => {
+      this.groupNameList = res.data
+    })
+
+    setTimeout(() => {
+      this.loading = !this.loading
+    }, 1000)
+  }
+}
+</script>
+
+<style lang='less' scoped>
+@import 'Analysis.less';
+</style>

From 4946afc8d448cedef91b2288ce4d37ceae327426 Mon Sep 17 00:00:00 2001
From: zhengweilin <zhengweilin@bw8848.com>
Date: Wed, 27 Mar 2024 11:46:13 +0800
Subject: [PATCH 3/4] =?UTF-8?q?feat:=203.2.0=20=E5=B7=A5=E4=BD=9C=E6=B5=81?=
 =?UTF-8?q?Dashboard=E5=A4=9A=E6=95=B0=E6=8D=AE=E6=BA=90=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4I93NGB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/JobLogMessageMapper.java           |  2 -
 .../datasource/persistence/po/JobSummary.java |  2 +-
 .../mariadb/mapper/JobLogMessageMapper.xml    | 14 +++-
 .../mariadb/mapper/JobSummaryMapper.xml       | 55 ++++++--------
 .../mysql/mapper/JobLogMessageMapper.xml      | 29 +++----
 .../mysql/mapper/JobSummaryMapper.xml         | 11 +--
 .../oracle/mapper/JobLogMessageMapper.xml     | 14 +++-
 .../oracle/mapper/JobSummaryMapper.xml        | 76 +++++++++----------
 .../postgres/mapper/JobLogMessageMapper.xml   | 14 +++-
 .../postgres/mapper/JobSummaryMapper.xml      | 55 ++++++--------
 .../sqlserver/mapper/JobLogMessageMapper.xml  | 14 +++-
 .../sqlserver/mapper/JobSummaryMapper.xml     | 56 ++++++--------
 .../support/schedule/JobLogMergeSchedule.java | 38 +++++-----
 .../support/schedule/JobSummarySchedule.java  |  2 +-
 .../schedule/WorkflowJobSummarySchedule.java  |  2 +-
 15 files changed, 192 insertions(+), 192 deletions(-)

diff --git a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobLogMessageMapper.java b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobLogMessageMapper.java
index 497218ef..ba11c5ef 100644
--- a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobLogMessageMapper.java
+++ b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobLogMessageMapper.java
@@ -18,6 +18,4 @@ import java.util.List;
 public interface JobLogMessageMapper extends BaseMapper<JobLogMessage> {
 
     int batchInsert(List<JobLogMessage> list);
-
-    int batchUpdate(List<JobLogMessage> list);
 }
diff --git a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/po/JobSummary.java b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/po/JobSummary.java
index 71a3cbcf..5b5a46db 100644
--- a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/po/JobSummary.java
+++ b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/po/JobSummary.java
@@ -40,7 +40,7 @@ public class JobSummary implements Serializable {
     /**
      * '任务信息id'
      */
-    private Long jobId;
+    private Long businessId;
 
     /**
      * '统计时间'
diff --git a/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/JobLogMessageMapper.xml b/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/JobLogMessageMapper.xml
index 98696452..11f0b99a 100644
--- a/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/JobLogMessageMapper.xml
+++ b/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/JobLogMessageMapper.xml
@@ -18,8 +18,18 @@
 
     <!-- 定义批量新增的 SQL 映射 -->
     <insert id="batchInsert" parameterType="java.util.List">
-        INSERT INTO job_log_message (namespace_id, group_name, job_id, task_batch_id, task_id, log_num, message,
-        create_dt, real_time)
+        INSERT INTO job_log_message
+        (
+        namespace_id,
+        group_name,
+        job_id,
+        task_batch_id,
+        task_id,
+        log_num,
+        message,
+        create_dt,
+        real_time
+        )
         VALUES
         <foreach collection="list" item="item" separator=",">
             (
diff --git a/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/JobSummaryMapper.xml b/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/JobSummaryMapper.xml
index 4017a30d..00448cdd 100644
--- a/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/JobSummaryMapper.xml
+++ b/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/JobSummaryMapper.xml
@@ -5,8 +5,9 @@
         <id column="id" jdbcType="BIGINT" property="id"/>
         <result column="namespace_id" jdbcType="TINYINT" property="namespaceId"/>
         <result column="group_name" jdbcType="TINYINT" property="groupName"/>
-        <result column="job_id" jdbcType="TINYINT" property="jobId"/>
+        <result column="business_id" jdbcType="TINYINT" property="businessId"/>
         <result column="trigger_at" jdbcType="TIMESTAMP" property="triggerAt"/>
+        <result column="system_task_type" jdbcType="TINYINT" property="systemTaskType"/>
         <result column="success_num" jdbcType="TINYINT" property="successNum"/>
         <result column="fail_num" jdbcType="TINYINT" property="failNum"/>
         <result column="fail_reason" jdbcType="VARCHAR" property="failReason"/>
@@ -20,15 +21,16 @@
 
     <insert id="insertOrUpdate" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO
-        job_summary (namespace_id, group_name, job_id, trigger_at,
+        job_summary (namespace_id, group_name, business_id, trigger_at,
         success_num,fail_num,fail_reason,stop_num,stop_reason, cancel_num,cancel_reason)
         VALUES
         <foreach collection="list" item="item" separator=",">
             (
             #{item.namespaceId},
             #{item.groupName},
-            #{item.jobId},
+            #{item.businessId},
             #{item.triggerAt},
+            #{item.systemTaskType},
             #{item.successNum},
             #{item.failNum},
             #{item.failReason},
@@ -51,29 +53,12 @@
     <select id="jobLineList"
             resultType="com.aizuda.easy.retry.template.datasource.persistence.dataobject.DashboardLineResponseDO">
         SELECT
-        <choose>
-            <when test="type == 'DAY'">
-                DATE_FORMAT(create_dt,'%H')
-            </when>
-            <when test="type == 'WEEK'">
-                DATE_FORMAT(create_dt,'%Y-%m-%d')
-            </when>
-            <when test="type =='MONTH'">
-                DATE_FORMAT(create_dt,'%Y-%m-%d')
-            </when>
-            <when test="type == 'YEAR'">
-                DATE_FORMAT(create_dt,'%Y-%m')
-            </when>
-            <otherwise>
-                DATE_FORMAT(create_dt,'%Y-%m-%d')
-            </otherwise>
-        </choose>
-        AS createDt,
-        ifnull(SUM(success_num), 0) AS success,
-        ifnull(SUM(fail_num), 0) AS failNum,
-        ifnull(SUM(stop_num), 0) AS stop,
-        ifnull(SUM(cancel_num), 0) AS cancel,
-        ifnull(SUM(fail_num + stop_num + cancel_num), 0) AS fail,
+        DATE_FORMAT(trigger_at, #{dateFormat})                         AS createDt,
+        ifnull(SUM(success_num), 0)                                    AS success,
+        ifnull(SUM(fail_num), 0)                                       AS failNum,
+        ifnull(SUM(stop_num), 0)                                       AS stop,
+        ifnull(SUM(cancel_num), 0)                                     AS cancel,
+        ifnull(SUM(fail_num + stop_num + cancel_num), 0)               AS fail,
         ifnull(SUM(success_num + fail_num + stop_num + cancel_num), 0) AS total
         FROM job_summary
         <where>
@@ -86,9 +71,9 @@
             <if test="groupName != null and groupName != '' ">
                 AND group_name = #{groupName}
             </if>
-            AND namespace_id = #{namespaceId} AND trigger_at BETWEEN #{from} AND #{to}
+            AND system_task_type = #{systemTaskType} AND namespace_id = #{namespaceId} AND trigger_at BETWEEN #{from} AND #{to}
         </where>
-        GROUP BY createDt
+        GROUP BY DATE_FORMAT(trigger_at, #{dateFormat})
     </select>
 
     <select id="toJobTask"
@@ -99,7 +84,7 @@
                ifnull(sum(fail_num), 0)                                       AS failNum,
                ifnull(sum(success_num + fail_num + stop_num + cancel_num), 0) AS totalNum
         FROM job_summary
-        WHERE namespace_id = #{namespaceId}
+        WHERE system_task_type = #{systemTaskType} AND namespace_id = #{namespaceId}
         <if test="groupNames != null and groupNames.size > 0">
             AND group_name IN
             <foreach collection="groupNames" item="groupName" open="(" separator="," close=")">
@@ -111,7 +96,12 @@
     <select id="dashboardRank"
             resultType="com.aizuda.easy.retry.template.datasource.persistence.dataobject.DashboardRetryLineResponseDO$Rank">
         SELECT
-        CONCAT(group_name, '/', (SELECT job_name FROM job WHERE id=job_id)) `name`,
+        <if test="systemTaskType == 3">
+            CONCAT(group_name, '/', (SELECT job_name FROM job WHERE id = job_id)) `name`,
+        </if>
+        <if test="systemTaskType == 4">
+            CONCAT(group_name, '/', (SELECT workflow_name FROM workflow WHERE id = business_id)) `name`,
+        </if>
         SUM(fail_num) AS total FROM job_summary
         <where>
             <if test="groupNames != null and groupNames.size > 0">
@@ -125,8 +115,9 @@
             </if>
             AND trigger_at >= #{startTime} AND trigger_at &lt;= #{endTime}
         </where>
+        AND system_task_type = #{systemTaskType}
         AND namespace_id = #{namespaceId}
-        GROUP BY namespace_id, group_name, job_id
+        GROUP BY namespace_id, group_name, business_id
         HAVING total > 0
         ORDER BY total DESC LIMIT 10
     </select>
@@ -135,7 +126,7 @@
             resultType="com.aizuda.easy.retry.template.datasource.persistence.dataobject.DashboardRetryLineResponseDO$Task">
         SELECT group_name                                        AS groupName,
                SUM(CASE WHEN (job_status = 1) THEN 1 ELSE 0 END) AS run,
-               count(*)                                          AS total
+               COUNT(*)                                          AS total
         FROM job
         WHERE namespace_id = #{namespaceId}
         <if test="groupNames != null and groupNames.size > 0">
diff --git a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobLogMessageMapper.xml b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobLogMessageMapper.xml
index 923a9401..11f0b99a 100644
--- a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobLogMessageMapper.xml
+++ b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobLogMessageMapper.xml
@@ -18,8 +18,18 @@
 
     <!-- 定义批量新增的 SQL 映射 -->
     <insert id="batchInsert" parameterType="java.util.List">
-        INSERT INTO job_log_message (namespace_id, group_name, job_id, task_batch_id, task_id, log_num, message,
-        create_dt, real_time)
+        INSERT INTO job_log_message
+        (
+        namespace_id,
+        group_name,
+        job_id,
+        task_batch_id,
+        task_id,
+        log_num,
+        message,
+        create_dt,
+        real_time
+        )
         VALUES
         <foreach collection="list" item="item" separator=",">
             (
@@ -35,19 +45,4 @@
             )
         </foreach>
     </insert>
-
-    <update id="batchUpdate" parameterType="java.util.List">
-        UPDATE job_log_message jlm,
-        (
-        <foreach collection="list" item="item" index="index" separator=" UNION ALL ">
-            SELECT
-            #{item.message} AS message,
-            #{item.logNum} AS log_num,
-            #{item.id} AS id
-        </foreach>
-        ) tt
-        SET
-        jlm.message = tt.message, jlm.log_num = tt.log_num
-        WHERE jlm.id = tt.id
-    </update>
 </mapper>
diff --git a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml
index 68cc65f7..23f120ac 100644
--- a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml
+++ b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml
@@ -5,8 +5,9 @@
         <id column="id" jdbcType="BIGINT" property="id"/>
         <result column="namespace_id" jdbcType="TINYINT" property="namespaceId"/>
         <result column="group_name" jdbcType="TINYINT" property="groupName"/>
-        <result column="job_id" jdbcType="TINYINT" property="jobId"/>
+        <result column="business_id" jdbcType="TINYINT" property="businessId"/>
         <result column="trigger_at" jdbcType="TIMESTAMP" property="triggerAt"/>
+        <result column="system_task_type" jdbcType="TINYINT" property="systemTaskType"/>
         <result column="success_num" jdbcType="TINYINT" property="successNum"/>
         <result column="fail_num" jdbcType="TINYINT" property="failNum"/>
         <result column="fail_reason" jdbcType="VARCHAR" property="failReason"/>
@@ -20,14 +21,14 @@
 
     <insert id="insertOrUpdate" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO
-        job_summary (namespace_id, group_name, job_id, trigger_at, system_task_type,
+        job_summary (namespace_id, group_name, business_id, trigger_at, system_task_type,
         success_num,fail_num,fail_reason,stop_num,stop_reason, cancel_num,cancel_reason)
         VALUES
         <foreach collection="list" item="item" separator=",">
             (
             #{item.namespaceId},
             #{item.groupName},
-            #{item.jobId},
+            #{item.businessId},
             #{item.triggerAt},
             #{item.systemTaskType},
             #{item.successNum},
@@ -99,7 +100,7 @@
             CONCAT(group_name, '/', (SELECT job_name FROM job WHERE id = job_id)) `name`,
         </if>
         <if test="systemTaskType == 4">
-        CONCAT(group_name, '/', (SELECT workflow_name FROM workflow WHERE id = job_id)) `name`,
+        CONCAT(group_name, '/', (SELECT workflow_name FROM workflow WHERE id = business_id)) `name`,
         </if>
         SUM(fail_num) AS total FROM job_summary
         <where>
@@ -116,7 +117,7 @@
         </where>
         AND system_task_type = #{systemTaskType}
         AND namespace_id = #{namespaceId}
-        GROUP BY namespace_id, group_name, job_id
+        GROUP BY namespace_id, group_name, business_id
         HAVING total > 0
         ORDER BY total DESC LIMIT 10
     </select>
diff --git a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobLogMessageMapper.xml b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobLogMessageMapper.xml
index ac1d0630..91bbeb71 100644
--- a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobLogMessageMapper.xml
+++ b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobLogMessageMapper.xml
@@ -20,8 +20,18 @@
     <insert id="batchInsert" parameterType="java.util.List">
         INSERT ALL
         <foreach collection="list" item="item" separator="">
-            INTO job_log_message (namespace_id, group_name, job_id, task_batch_id, task_id, log_num, message,
-                                         create_dt, real_time)
+            INTO job_log_message
+            (
+            namespace_id,
+            group_name,
+            job_id,
+            task_batch_id,
+            task_id,
+            log_num,
+            message,
+            create_dt,
+            real_time
+            )
             VALUES (
                 #{item.namespaceId},
                 #{item.groupName},
diff --git a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobSummaryMapper.xml b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobSummaryMapper.xml
index ac3f2ae9..d590c99a 100644
--- a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobSummaryMapper.xml
+++ b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobSummaryMapper.xml
@@ -5,8 +5,9 @@
         <id column="id" jdbcType="BIGINT" property="id"/>
         <result column="namespace_id" jdbcType="TINYINT" property="namespaceId"/>
         <result column="group_name" jdbcType="TINYINT" property="groupName"/>
-        <result column="job_id" jdbcType="TINYINT" property="jobId"/>
+        <result column="business_id" jdbcType="TINYINT" property="businessId"/>
         <result column="trigger_at" jdbcType="TIMESTAMP" property="triggerAt"/>
+        <result column="system_task_type" jdbcType="TINYINT" property="systemTaskType"/>
         <result column="success_num" jdbcType="TINYINT" property="successNum"/>
         <result column="fail_num" jdbcType="TINYINT" property="failNum"/>
         <result column="fail_reason" jdbcType="VARCHAR" property="failReason"/>
@@ -23,21 +24,22 @@
             USING (
                 <foreach collection="list" item="item" separator=" UNION ALL ">
                     SELECT
-                        #{item.namespaceId} AS namespace_id,
-                        #{item.groupName} AS group_name,
-                        #{item.jobId} AS job_id,
-                        #{item.triggerAt} AS trigger_at,
-                        #{item.successNum} AS success_num,
-                        #{item.failNum} AS fail_num,
-                        #{item.failReason} AS fail_reason,
-                        #{item.stopNum} AS stop_num,
-                        #{item.stopReason} AS stop_reason,
-                        #{item.cancelNum} AS cancel_num,
-                        #{item.cancelReason} AS cancel_reason
+                        #{item.namespaceId}    AS namespace_id,
+                        #{item.groupName}      AS group_name,
+                        #{item.businessId}     AS business_id,
+                        #{item.triggerAt}      AS trigger_at,
+                        #{item.systemTaskType} AS system_task_type,
+                        #{item.successNum}     AS success_num,
+                        #{item.failNum}        AS fail_num,
+                        #{item.failReason}     AS fail_reason,
+                        #{item.stopNum}        AS stop_num,
+                        #{item.stopReason}     AS stop_reason,
+                        #{item.cancelNum}      AS cancel_num,
+                        #{item.cancelReason}   AS cancel_reason
                     FROM DUAL
                 </foreach>
             ) src
-            ON (dest.job_id = src.job_id AND dest.trigger_at = src.trigger_at)
+            ON (dest.job_id = src.job_id AND dest.trigger_at = src.trigger_at AND dest.system_task_type = src.system_task_type)
         WHEN MATCHED THEN
             UPDATE SET
                 dest.success_num = src.success_num,
@@ -48,7 +50,7 @@
                 dest.cancel_num = src.cancel_num,
                 dest.cancel_reason = src.cancel_reason
         WHEN NOT MATCHED THEN
-            INSERT (namespace_id, group_name, job_id, trigger_at,
+            INSERT (namespace_id, group_name, business_id, trigger_at, system_task_type,
                     success_num,fail_num,fail_reason,stop_num,stop_reason, cancel_num,cancel_reason)
             VALUES
                 <foreach collection="list" item="item" separator=",">
@@ -57,6 +59,7 @@
                         #{item.groupName},
                         #{item.jobId},
                         #{item.triggerAt},
+                        #{item.systemTaskType},
                         #{item.successNum},
                         #{item.failNum},
                         #{item.failReason},
@@ -72,32 +75,15 @@
             resultType="com.aizuda.easy.retry.template.datasource.persistence.dataobject.DashboardLineResponseDO">
         SELECT
             createDt,
-            COALESCE(SUM(success_num), 0) AS success,
-            COALESCE(SUM(fail_num), 0) AS failNum,
-            COALESCE(SUM(stop_num), 0) AS stop,
-            COALESCE(SUM(cancel_num), 0) AS cancel,
-            COALESCE(SUM(fail_num + stop_num + cancel_num), 0) AS fail,
+            COALESCE(SUM(success_num), 0)                                    AS success,
+            COALESCE(SUM(fail_num), 0)                                       AS failNum,
+            COALESCE(SUM(stop_num), 0)                                       AS stop,
+            COALESCE(SUM(cancel_num), 0)                                     AS cancel,
+            COALESCE(SUM(fail_num + stop_num + cancel_num), 0)               AS fail,
             COALESCE(SUM(success_num + fail_num + stop_num + cancel_num), 0) AS total
         FROM (
             SELECT
-                <choose>
-                    <when test="type == 'DAY'">
-                        TO_CHAR(create_dt, 'HH24')
-                    </when>
-                    <when test="type == 'WEEK'">
-                        TO_CHAR(create_dt, 'yyyy-MM-dd')
-                    </when>
-                    <when test="type =='MONTH'">
-                        TO_CHAR(create_dt, 'yyyy-MM-dd')
-                    </when>
-                    <when test="type == 'YEAR'">
-                        TO_CHAR(create_dt, 'yyyy-MM')
-                    </when>
-                    <otherwise>
-                        TO_CHAR(create_dt, 'yyyy-MM-dd')
-                    </otherwise>
-                </choose>
-                AS createDt,
+                DATE_FORMAT(trigger_at, #{dateFormat}) AS createDt,
                 success_num,
                 fail_num,
                 stop_num,
@@ -113,10 +99,10 @@
                 <if test="groupName != null and groupName != '' ">
                     AND group_name = #{groupName}
                 </if>
-                AND namespace_id = #{namespaceId} AND trigger_at BETWEEN #{from} AND #{to}
+                AND system_task_type = #{systemTaskType} AND namespace_id = #{namespaceId} AND trigger_at BETWEEN #{from} AND #{to}
             </where>
         )
-        GROUP BY createDt
+        GROUP BY DATE_FORMAT(trigger_at, #{dateFormat})
     </select>
 
     <select id="toJobTask"
@@ -127,7 +113,7 @@
                COALESCE(sum(fail_num), 0)                                       AS failNum,
                COALESCE(sum(success_num + fail_num + stop_num + cancel_num), 0) AS totalNum
         FROM job_summary
-        WHERE namespace_id = #{namespaceId}
+        WHERE system_task_type = #{systemTaskType} AND namespace_id = #{namespaceId}
         <if test="groupNames != null and groupNames.size > 0">
             AND group_name IN
             <foreach collection="groupNames" item="groupName" open="(" separator="," close=")">
@@ -141,7 +127,12 @@
         SELECT * FROM
         (
             SELECT
-                group_name || '/' || (SELECT job_name FROM job WHERE id=job_id) AS name,
+                <if test="systemTaskType == 3">
+                    group_name || '/' || (SELECT job_name FROM job WHERE id = job_id) AS name,
+                </if>
+                <if test="systemTaskType == 4">
+                    group_name || '/' || (SELECT workflow_name FROM workflow WHERE id = business_id) AS name,
+                </if>
                 SUM(fail_num) AS total
             FROM job_summary
             <where>
@@ -156,8 +147,9 @@
                 </if>
                 AND trigger_at BETWEEN #{startTime} AND #{endTime}
             </where>
+            AND system_task_type = #{systemTaskType}
             AND namespace_id = #{namespaceId}
-            GROUP BY namespace_id, group_name, job_id
+            GROUP BY namespace_id, group_name, business_id
             HAVING SUM(fail_num) > 0
             ORDER BY total DESC
         )
diff --git a/easy-retry-datasource/easy-retry-postgres-datasource/src/main/resources/postgres/mapper/JobLogMessageMapper.xml b/easy-retry-datasource/easy-retry-postgres-datasource/src/main/resources/postgres/mapper/JobLogMessageMapper.xml
index d935a181..bb3d9529 100644
--- a/easy-retry-datasource/easy-retry-postgres-datasource/src/main/resources/postgres/mapper/JobLogMessageMapper.xml
+++ b/easy-retry-datasource/easy-retry-postgres-datasource/src/main/resources/postgres/mapper/JobLogMessageMapper.xml
@@ -17,8 +17,18 @@
     </resultMap>
     <!-- 定义批量新增的 SQL 映射 -->
     <insert id="batchInsert" parameterType="java.util.List">
-        INSERT INTO job_log_message (namespace_id, group_name, job_id, task_batch_id, task_id, log_num, message,
-        create_dt, real_time)
+        INSERT INTO job_log_message
+        (
+        namespace_id,
+        group_name,
+        job_id,
+        task_batch_id,
+        task_id,
+        log_num,
+        message,
+        create_dt,
+        real_time
+        )
         VALUES
         <foreach collection="list" item="item" separator=",">
             (
diff --git a/easy-retry-datasource/easy-retry-postgres-datasource/src/main/resources/postgres/mapper/JobSummaryMapper.xml b/easy-retry-datasource/easy-retry-postgres-datasource/src/main/resources/postgres/mapper/JobSummaryMapper.xml
index f9094172..96fbbf71 100644
--- a/easy-retry-datasource/easy-retry-postgres-datasource/src/main/resources/postgres/mapper/JobSummaryMapper.xml
+++ b/easy-retry-datasource/easy-retry-postgres-datasource/src/main/resources/postgres/mapper/JobSummaryMapper.xml
@@ -5,8 +5,9 @@
         <id column="id" jdbcType="BIGINT" property="id"/>
         <result column="namespace_id" jdbcType="TINYINT" property="namespaceId"/>
         <result column="group_name" jdbcType="TINYINT" property="groupName"/>
-        <result column="job_id" jdbcType="TINYINT" property="jobId"/>
+        <result column="business_id" jdbcType="TINYINT" property="businessId"/>
         <result column="trigger_at" jdbcType="TIMESTAMP" property="triggerAt"/>
+        <result column="system_task_type" jdbcType="TINYINT" property="systemTaskType"/>
         <result column="success_num" jdbcType="TINYINT" property="successNum"/>
         <result column="fail_num" jdbcType="TINYINT" property="failNum"/>
         <result column="fail_reason" jdbcType="VARCHAR" property="failReason"/>
@@ -20,15 +21,16 @@
 
     <insert id="insertOrUpdate" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO
-        job_summary (namespace_id, group_name, job_id, trigger_at,
+        job_summary (namespace_id, group_name, business_id, trigger_at, system_task_type,
         success_num,fail_num,fail_reason,stop_num,stop_reason, cancel_num,cancel_reason)
         VALUES
         <foreach collection="list" item="item" separator=",">
             (
             #{item.namespaceId},
             #{item.groupName},
-            #{item.jobId},
+            #{item.businessId},
             #{item.triggerAt},
+            #{item.systemTaskType},
             #{item.successNum},
             #{item.failNum},
             #{item.failReason},
@@ -38,7 +40,7 @@
             #{item.cancelReason}
             )
         </foreach>
-        ON CONFLICT (job_id, trigger_at) DO UPDATE
+        ON CONFLICT (business_id, trigger_at, system_task_type) DO UPDATE
             SET success_num = EXCLUDED.success_num,
                 fail_num = EXCLUDED.fail_num,
                 fail_reason = EXCLUDED.fail_reason,
@@ -51,29 +53,12 @@
     <select id="jobLineList"
             resultType="com.aizuda.easy.retry.template.datasource.persistence.dataobject.DashboardLineResponseDO">
         SELECT
-        <choose>
-            <when test="type == 'DAY'">
-                to_char(create_dt,'%H')
-            </when>
-            <when test="type == 'WEEK'">
-                to_char(create_dt,'%Y-%m-%d')
-            </when>
-            <when test="type =='MONTH'">
-                to_char(create_dt,'%Y-%m-%d')
-            </when>
-            <when test="type == 'YEAR'">
-                to_char(create_dt,'%Y-%m')
-            </when>
-            <otherwise>
-                to_char(create_dt,'%Y-%m-%d')
-            </otherwise>
-        </choose>
-        AS createDt,
-        COALESCE(SUM(success_num), 0) AS success,
-        COALESCE(SUM(fail_num), 0) AS failNum,
-        COALESCE(SUM(stop_num), 0) AS stop,
-        COALESCE(SUM(cancel_num), 0) AS cancel,
-        COALESCE(SUM(fail_num + stop_num + cancel_num), 0) AS fail,
+        DATE_FORMAT(trigger_at, #{dateFormat})                           AS createDt,
+        COALESCE(SUM(success_num), 0)                                    AS success,
+        COALESCE(SUM(fail_num), 0)                                       AS failNum,
+        COALESCE(SUM(stop_num), 0)                                       AS stop,
+        COALESCE(SUM(cancel_num), 0)                                     AS cancel,
+        COALESCE(SUM(fail_num + stop_num + cancel_num), 0)               AS fail,
         COALESCE(SUM(success_num + fail_num + stop_num + cancel_num), 0) AS total
         FROM job_summary
         <where>
@@ -86,9 +71,9 @@
             <if test="groupName != null and groupName != '' ">
                 AND group_name = #{groupName}
             </if>
-            AND namespace_id = #{namespaceId} AND trigger_at BETWEEN #{from} AND #{to}
+            AND system_task_type = #{systemTaskType} AND namespace_id = #{namespaceId} AND trigger_at BETWEEN #{from} AND #{to}
         </where>
-        GROUP BY createDt
+        GROUP BY DATE_FORMAT(trigger_at, #{dateFormat})
     </select>
 
     <select id="toJobTask"
@@ -99,7 +84,7 @@
                COALESCE(sum(fail_num), 0)                                       AS failNum,
                COALESCE(sum(success_num + fail_num + stop_num + cancel_num), 0) AS totalNum
         FROM job_summary
-        WHERE namespace_id = #{namespaceId}
+        WHERE system_task_type = #{systemTaskType} AND namespace_id = #{namespaceId}
         <if test="groupNames != null and groupNames.size > 0">
             AND group_name IN
             <foreach collection="groupNames" item="groupName" open="(" separator="," close=")">
@@ -111,7 +96,12 @@
     <select id="dashboardRank"
             resultType="com.aizuda.easy.retry.template.datasource.persistence.dataobject.DashboardRetryLineResponseDO$Rank">
         SELECT
-        CONCAT(group_name, '/', (SELECT job_name FROM job WHERE id=job_id)) name,
+        <if test="systemTaskType == 3">
+            CONCAT(group_name, '/', (SELECT job_name FROM job WHERE id = job_id)) name,
+        </if>
+        <if test="systemTaskType == 4">
+            CONCAT(group_name, '/', (SELECT workflow_name FROM workflow WHERE id = business_id)) name,
+        </if>
         SUM(fail_num) AS total FROM job_summary
         <where>
             <if test="groupNames != null and groupNames.size > 0">
@@ -125,8 +115,9 @@
             </if>
             AND trigger_at >= #{startTime} AND trigger_at &lt;= #{endTime}
         </where>
+        AND system_task_type = #{systemTaskType}
         AND namespace_id = #{namespaceId}
-        GROUP BY namespace_id, group_name, job_id
+        GROUP BY namespace_id, group_name, business_id
         HAVING SUM(fail_num) > 0
         ORDER BY total DESC LIMIT 10
     </select>
diff --git a/easy-retry-datasource/easy-retry-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobLogMessageMapper.xml b/easy-retry-datasource/easy-retry-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobLogMessageMapper.xml
index 5abf6d9d..42d4ddf3 100644
--- a/easy-retry-datasource/easy-retry-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobLogMessageMapper.xml
+++ b/easy-retry-datasource/easy-retry-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobLogMessageMapper.xml
@@ -18,8 +18,18 @@
 
     <!-- 定义批量新增的 SQL 映射 -->
     <insert id="batchInsert" parameterType="java.util.List">
-        INSERT INTO job_log_message (namespace_id, group_name, job_id, task_batch_id, task_id,
-                                     log_num, message, create_dt, real_time)
+        INSERT INTO job_log_message
+        (
+        namespace_id,
+        group_name,
+        job_id,
+        task_batch_id,
+        task_id,
+        log_num,
+        message,
+        create_dt,
+        real_time
+        )
         VALUES
         <foreach collection="list" item="item" separator=",">
             (
diff --git a/easy-retry-datasource/easy-retry-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobSummaryMapper.xml b/easy-retry-datasource/easy-retry-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobSummaryMapper.xml
index 2a25e335..447bc6c9 100644
--- a/easy-retry-datasource/easy-retry-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobSummaryMapper.xml
+++ b/easy-retry-datasource/easy-retry-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobSummaryMapper.xml
@@ -5,8 +5,9 @@
         <id column="id" jdbcType="BIGINT" property="id"/>
         <result column="namespace_id" jdbcType="TINYINT" property="namespaceId"/>
         <result column="group_name" jdbcType="TINYINT" property="groupName"/>
-        <result column="job_id" jdbcType="TINYINT" property="jobId"/>
+        <result column="business_id" jdbcType="TINYINT" property="businessId"/>
         <result column="trigger_at" jdbcType="TIMESTAMP" property="triggerAt"/>
+        <result column="system_task_type" jdbcType="TINYINT" property="systemTaskType"/>
         <result column="success_num" jdbcType="TINYINT" property="successNum"/>
         <result column="fail_num" jdbcType="TINYINT" property="failNum"/>
         <result column="fail_reason" jdbcType="VARCHAR" property="failReason"/>
@@ -26,8 +27,9 @@
                     (
                         #{item.namespaceId},
                         #{item.groupName},
-                        #{item.jobId},
+                        #{item.businessId},
                         #{item.triggerAt},
+                        #{item.systemTaskType},
                         #{item.successNum},
                         #{item.failNum},
                         #{item.failReason},
@@ -37,10 +39,10 @@
                         #{item.cancelReason}
                     )
                 </foreach>
-        ) AS source (namespace_id, group_name, job_id, trigger_at,
+        ) AS source (namespace_id, group_name, business_id, trigger_at, system_task_type,
                      success_num, fail_num, fail_reason, stop_num, stop_reason, cancel_num, cancel_reason)
         ON target.namespace_id = source.namespace_id
-            AND target.job_id = source.job_id
+            AND target.business_id = source.business_id
         WHEN MATCHED THEN
             UPDATE SET
                 target.success_num = source.success_num,
@@ -51,9 +53,9 @@
                 target.cancel_num = source.cancel_num,
                 target.cancel_reason = source.cancel_reason
         WHEN NOT MATCHED THEN
-            INSERT (namespace_id, group_name, job_id, trigger_at,
+            INSERT (namespace_id, group_name, business_id, trigger_at, system_task_type,
                     success_num, fail_num, fail_reason, stop_num, stop_reason, cancel_num, cancel_reason)
-            VALUES (source.namespace_id, source.group_name, source.job_id, source.trigger_at,
+            VALUES (source.namespace_id, source.group_name, source.business_id, source.trigger_at, source.system_task_type,
                     source.success_num, source.fail_num, source.fail_reason, source.stop_num, source.stop_reason,
                     source.cancel_num, source.cancel_reason);
     </insert>
@@ -62,30 +64,14 @@
             resultType="com.aizuda.easy.retry.template.datasource.persistence.dataobject.DashboardLineResponseDO">
         SELECT
             createDt,
-            ISNULL(SUM(success_num), 0) AS success,
-            ISNULL(SUM(stop_num), 0) AS stop,
-            ISNULL(SUM(cancel_num), 0) AS cancel,
-            ISNULL(SUM(fail_num), 0) AS fail,
+            ISNULL(SUM(success_num), 0)                                    AS success,
+            ISNULL(SUM(stop_num), 0)                                       AS stop,
+            ISNULL(SUM(cancel_num), 0)                                     AS cancel,
+            ISNULL(SUM(fail_num), 0)                                       AS fail,
             ISNULL(SUM(success_num + fail_num + stop_num + cancel_num), 0) AS total
         FROM (
             SELECT
-                <choose>
-                    <when test="type == 'DAY'">
-                        FORMAT(create_dt,'HH24')
-                    </when>
-                    <when test="type == 'WEEK'">
-                        FORMAT(create_dt,'yyyy-MM-dd')
-                    </when>
-                    <when test="type =='MONTH'">
-                        FORMAT(create_dt,'yyyy-MM-dd')
-                    </when>
-                    <when test="type == 'YEAR'">
-                        FORMAT(create_dt,'yyyy-MM')
-                    </when>
-                    <otherwise>
-                        FORMAT(create_dt,'yyyy-MM-dd')
-                    </otherwise>
-                </choose> AS createDt,
+                DATE_FORMAT(trigger_at, #{dateFormat}) AS createDt,
                 success_num,
                 stop_num,
                 cancel_num,
@@ -101,11 +87,12 @@
                 <if test="groupName != null and groupName != '' ">
                     AND group_name = #{groupName}
                 </if>
+                AND system_task_type = #{systemTaskType}
                 AND namespace_id = #{namespaceId}
                 AND trigger_at BETWEEN #{from} AND #{to}
             </where>
         ) AS subquery
-        GROUP BY createDt
+        GROUP BY DATE_FORMAT(trigger_at, #{dateFormat})
     </select>
 
     <select id="toJobTask"
@@ -117,7 +104,7 @@
             ISNULL(sum(fail_num), 0) AS failNum,
             ISNULL(sum(success_num + fail_num + stop_num + cancel_num), 0) AS totalNum
         FROM job_summary
-        WHERE namespace_id = #{namespaceId}
+        WHERE system_task_type = #{systemTaskType} AND namespace_id = #{namespaceId}
         <if test="groupNames != null and groupNames.size > 0">
             AND group_name IN
             <foreach collection="groupNames" item="groupName" open="(" separator="," close=")">
@@ -129,7 +116,13 @@
     <select id="dashboardRank"
             resultType="com.aizuda.easy.retry.template.datasource.persistence.dataobject.DashboardRetryLineResponseDO$Rank">
         SELECT TOP 10
-            CONCAT(group_name, '/', (SELECT job_name FROM job WHERE id=job_id)) name,
+
+            <if test="systemTaskType == 3">
+                CONCAT(group_name, '/', (SELECT job_name FROM job WHERE id = job_id)) name,
+            </if>
+            <if test="systemTaskType == 4">
+                CONCAT(group_name, '/', (SELECT workflow_name FROM workflow WHERE id = business_id)) name,
+            </if>
             SUM(fail_num) AS total
         FROM job_summary
         <where>
@@ -144,8 +137,9 @@
             </if>
             AND trigger_at BETWEEN #{startTime} AND #{endTime}
             AND namespace_id = #{namespaceId}
+            AND system_task_type = #{systemTaskType}
         </where>
-        GROUP BY namespace_id, group_name, job_id
+        GROUP BY namespace_id, group_name, business_id
         HAVING SUM(fail_num) > 0
         ORDER BY name DESC
     </select>
diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobLogMergeSchedule.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobLogMergeSchedule.java
index 18786e76..ee250c5c 100644
--- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobLogMergeSchedule.java
+++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobLogMergeSchedule.java
@@ -115,7 +115,7 @@ public class JobLogMergeSchedule extends AbstractSchedule implements Lifecycle {
         List<JobTaskBatch> jobTaskBatchList = jobTaskBatchMapper.selectPage(
                 new Page<>(0, 1000),
                 new LambdaUpdateWrapper<JobTaskBatch>().ge(JobTaskBatch::getId, startId)
-                        .eq(JobTaskBatch::getTaskBatchStatus, JobTaskBatchStatusEnum.SUCCESS.getStatus())
+                        .in(JobTaskBatch::getTaskBatchStatus, JobTaskBatchStatusEnum.COMPLETED)
                         .le(JobTaskBatch::getCreateDt, endTime)).getRecords();
         return JobTaskConverter.INSTANCE.toJobTaskBatchPartitionTasks(jobTaskBatchList);
     }
@@ -144,48 +144,46 @@ public class JobLogMergeSchedule extends AbstractSchedule implements Lifecycle {
                 }
 
                 List<Map.Entry<Long, List<JobLogMessage>>> jobLogMessageGroupList = jobLogMessageList.stream().collect(
-                        groupingBy(JobLogMessage::getTaskId)).entrySet().stream()
+                                groupingBy(JobLogMessage::getTaskId)).entrySet().stream()
                         .filter(entry -> entry.getValue().size() >= 2).collect(toList());
 
                 for (Map.Entry<Long/*taskId*/, List<JobLogMessage>> jobLogMessageMap : jobLogMessageGroupList) {
                     List<Long> jobLogMessageDeleteBatchIds = new ArrayList<>();
-                    List<JobLogMessage> jobLogMessageUpdateList = new ArrayList<>();
+                    List<JobLogMessage> jobLogMessageInsertBatchIds = new ArrayList<>();
 
                     List<String> mergeMessages = jobLogMessageMap.getValue().stream().map(k -> {
-                            jobLogMessageDeleteBatchIds.add(k.getId());
-                            return JsonUtil.parseObject(k.getMessage(), List.class);
-                        })
-                        .reduce((a, b) -> {
-                            // 合并日志信息
-                            List<String> list = new ArrayList<>();
-                            list.addAll(a);
-                            list.addAll(b);
-                            return list;
-                        }).get();
+                                jobLogMessageDeleteBatchIds.add(k.getId());
+                                return JsonUtil.parseObject(k.getMessage(), List.class);
+                            })
+                            .reduce((a, b) -> {
+                                // 合并日志信息
+                                List<String> list = new ArrayList<>();
+                                list.addAll(a);
+                                list.addAll(b);
+                                return list;
+                            }).get();
 
                     // 500条数据为一个批次
-                    List<List<String>> partitionMessages = Lists.partition(mergeMessages,
-                        systemProperties.getMergeLogNum());
+                    List<List<String>> partitionMessages = Lists.partition(mergeMessages, systemProperties.getMergeLogNum());
 
                     for (int i = 0; i < partitionMessages.size(); i++) {
                         // 深拷贝
-                        JobLogMessage jobLogMessage = JobTaskConverter.INSTANCE.toJobLogMessage( jobLogMessageMap.getValue().get(0));
+                        JobLogMessage jobLogMessage = JobTaskConverter.INSTANCE.toJobLogMessage(jobLogMessageMap.getValue().get(0));
                         List<String> messages = partitionMessages.get(i);
 
                         jobLogMessage.setLogNum(messages.size());
                         jobLogMessage.setMessage(JsonUtil.toJsonString(messages));
-                        jobLogMessageUpdateList.add(jobLogMessage);
+                        jobLogMessageInsertBatchIds.add(jobLogMessage);
                     }
 
                     // 批量删除、更新日志
                     if (CollectionUtil.isNotEmpty(jobLogMessageDeleteBatchIds)) {
                         jobLogMessageMapper.deleteBatchIds(jobLogMessageDeleteBatchIds);
                     }
-                    if (CollectionUtil.isNotEmpty(jobLogMessageUpdateList)) {
-                        jobLogMessageMapper.batchUpdate(jobLogMessageUpdateList);
+                    if (CollectionUtil.isNotEmpty(jobLogMessageInsertBatchIds)) {
+                        jobLogMessageMapper.batchInsert(jobLogMessageInsertBatchIds);
                     }
                 }
-
             }
         });
     }
diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobSummarySchedule.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobSummarySchedule.java
index 84436f90..79126e3f 100644
--- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobSummarySchedule.java
+++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobSummarySchedule.java
@@ -83,7 +83,7 @@ public class JobSummarySchedule extends AbstractSchedule implements Lifecycle {
         Map<Long, List<JobBatchSummaryResponseDO>> jobIdListMap = summaryResponseDOList.parallelStream().collect(Collectors.groupingBy(JobBatchSummaryResponseDO::getJobId));
         for (Map.Entry<Long, List<JobBatchSummaryResponseDO>> job : jobIdListMap.entrySet()) {
             JobSummary jobSummary = new JobSummary();
-            jobSummary.setJobId(job.getKey());
+            jobSummary.setBusinessId(job.getKey());
             jobSummary.setTriggerAt(triggerAt);
             jobSummary.setNamespaceId(job.getValue().get(0).getNamespaceId());
             jobSummary.setGroupName(job.getValue().get(0).getGroupName());
diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/WorkflowJobSummarySchedule.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/WorkflowJobSummarySchedule.java
index 8dc6349a..3c02c0e4 100644
--- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/WorkflowJobSummarySchedule.java
+++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/WorkflowJobSummarySchedule.java
@@ -86,7 +86,7 @@ public class WorkflowJobSummarySchedule extends AbstractSchedule implements Life
         Map<Long, List<JobBatchSummaryResponseDO>> jobIdListMap = summaryResponseDOList.parallelStream().collect(Collectors.groupingBy(JobBatchSummaryResponseDO::getJobId));
         for (Map.Entry<Long, List<JobBatchSummaryResponseDO>> job : jobIdListMap.entrySet()) {
             JobSummary jobSummary = new JobSummary();
-            jobSummary.setJobId(job.getKey());
+            jobSummary.setBusinessId(job.getKey());
             jobSummary.setTriggerAt(triggerAt);
             jobSummary.setNamespaceId(job.getValue().get(0).getNamespaceId());
             jobSummary.setGroupName(job.getValue().get(0).getGroupName());

From 1eb7826adc7d2935639b44c76a7a650e6b559f46 Mon Sep 17 00:00:00 2001
From: zhengweilin <zhengweilin@bw8848.com>
Date: Wed, 27 Mar 2024 14:03:01 +0800
Subject: [PATCH 4/4] =?UTF-8?q?feat:=203.2.0=20=E5=B7=A5=E4=BD=9C=E6=B5=81?=
 =?UTF-8?q?Dashboard=E5=A4=9A=E6=95=B0=E6=8D=AE=E6=BA=90=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4I93NGB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mariadb/mapper/JobSummaryMapper.xml    | 4 ++--
 .../src/main/resources/mysql/mapper/JobSummaryMapper.xml      | 4 ++--
 .../src/main/resources/oracle/mapper/JobSummaryMapper.xml     | 2 +-
 .../src/main/resources/postgres/mapper/JobSummaryMapper.xml   | 2 +-
 .../src/main/resources/sqlserver/mapper/JobSummaryMapper.xml  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/JobSummaryMapper.xml b/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/JobSummaryMapper.xml
index 00448cdd..6edc1ff8 100644
--- a/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/JobSummaryMapper.xml
+++ b/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/JobSummaryMapper.xml
@@ -97,10 +97,10 @@
             resultType="com.aizuda.easy.retry.template.datasource.persistence.dataobject.DashboardRetryLineResponseDO$Rank">
         SELECT
         <if test="systemTaskType == 3">
-            CONCAT(group_name, '/', (SELECT job_name FROM job WHERE id = job_id)) `name`,
+            CONCAT(group_name, '/', (SELECT job_name FROM job WHERE id = business_id)) name,
         </if>
         <if test="systemTaskType == 4">
-            CONCAT(group_name, '/', (SELECT workflow_name FROM workflow WHERE id = business_id)) `name`,
+            CONCAT(group_name, '/', (SELECT workflow_name FROM workflow WHERE id = business_id)) name,
         </if>
         SUM(fail_num) AS total FROM job_summary
         <where>
diff --git a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml
index 23f120ac..2906f463 100644
--- a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml
+++ b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml
@@ -97,10 +97,10 @@
             resultType="com.aizuda.easy.retry.template.datasource.persistence.dataobject.DashboardRetryLineResponseDO$Rank">
         SELECT
         <if test="systemTaskType == 3">
-            CONCAT(group_name, '/', (SELECT job_name FROM job WHERE id = job_id)) `name`,
+            CONCAT(group_name, '/', (SELECT job_name FROM job WHERE id = business_id)) name,
         </if>
         <if test="systemTaskType == 4">
-        CONCAT(group_name, '/', (SELECT workflow_name FROM workflow WHERE id = business_id)) `name`,
+        CONCAT(group_name, '/', (SELECT workflow_name FROM workflow WHERE id = business_id)) name,
         </if>
         SUM(fail_num) AS total FROM job_summary
         <where>
diff --git a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobSummaryMapper.xml b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobSummaryMapper.xml
index d590c99a..29097370 100644
--- a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobSummaryMapper.xml
+++ b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobSummaryMapper.xml
@@ -128,7 +128,7 @@
         (
             SELECT
                 <if test="systemTaskType == 3">
-                    group_name || '/' || (SELECT job_name FROM job WHERE id = job_id) AS name,
+                    group_name || '/' || (SELECT job_name FROM job WHERE id = business_id) AS name,
                 </if>
                 <if test="systemTaskType == 4">
                     group_name || '/' || (SELECT workflow_name FROM workflow WHERE id = business_id) AS name,
diff --git a/easy-retry-datasource/easy-retry-postgres-datasource/src/main/resources/postgres/mapper/JobSummaryMapper.xml b/easy-retry-datasource/easy-retry-postgres-datasource/src/main/resources/postgres/mapper/JobSummaryMapper.xml
index 96fbbf71..3e74d0be 100644
--- a/easy-retry-datasource/easy-retry-postgres-datasource/src/main/resources/postgres/mapper/JobSummaryMapper.xml
+++ b/easy-retry-datasource/easy-retry-postgres-datasource/src/main/resources/postgres/mapper/JobSummaryMapper.xml
@@ -97,7 +97,7 @@
             resultType="com.aizuda.easy.retry.template.datasource.persistence.dataobject.DashboardRetryLineResponseDO$Rank">
         SELECT
         <if test="systemTaskType == 3">
-            CONCAT(group_name, '/', (SELECT job_name FROM job WHERE id = job_id)) name,
+            CONCAT(group_name, '/', (SELECT job_name FROM job WHERE id = business_id)) name,
         </if>
         <if test="systemTaskType == 4">
             CONCAT(group_name, '/', (SELECT workflow_name FROM workflow WHERE id = business_id)) name,
diff --git a/easy-retry-datasource/easy-retry-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobSummaryMapper.xml b/easy-retry-datasource/easy-retry-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobSummaryMapper.xml
index 447bc6c9..f1e38ff7 100644
--- a/easy-retry-datasource/easy-retry-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobSummaryMapper.xml
+++ b/easy-retry-datasource/easy-retry-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobSummaryMapper.xml
@@ -118,7 +118,7 @@
         SELECT TOP 10
 
             <if test="systemTaskType == 3">
-                CONCAT(group_name, '/', (SELECT job_name FROM job WHERE id = job_id)) name,
+                CONCAT(group_name, '/', (SELECT job_name FROM job WHERE id = business_id)) name,
             </if>
             <if test="systemTaskType == 4">
                 CONCAT(group_name, '/', (SELECT workflow_name FROM workflow WHERE id = business_id)) name,