From e4bf37620c8622b67380a2365eb12d2a0ff17de2 Mon Sep 17 00:00:00 2001
From: Mohammad Arshad <arshad@apache.org>
Date: Mon, 20 Jan 2025 17:27:31 +0530
Subject: [PATCH] [Bug] Task instance filter by execution user is not working.

---
 .../org/apache/seatunnel/app/dal/dao/IJobInstanceDao.java | 2 ++
 .../seatunnel/app/dal/dao/impl/JobInstanceDaoImpl.java    | 4 +++-
 .../seatunnel/app/dal/mapper/JobInstanceMapper.java       | 2 ++
 .../app/service/impl/TaskInstanceServiceImpl.java         | 8 +++++++-
 .../apache/seatunnel/app/dal/mapper/JobInstanceMapper.xml | 6 ++++++
 5 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/IJobInstanceDao.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/IJobInstanceDao.java
index ec1619331..8568c9405 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/IJobInstanceDao.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/IJobInstanceDao.java
@@ -45,6 +45,8 @@ IPage<SeaTunnelJobInstanceDto> queryJobInstanceListPaging(
             Date startTime,
             Date endTime,
             String jobDefineId,
+            String executorName,
+            String stateType,
             JobMode jobMode);
 
     List<JobInstance> getAllJobInstance(@NonNull List<Long> jobInstanceIdList);
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/impl/JobInstanceDaoImpl.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/impl/JobInstanceDaoImpl.java
index 5ece72509..97618d8db 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/impl/JobInstanceDaoImpl.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/impl/JobInstanceDaoImpl.java
@@ -72,9 +72,11 @@ public IPage<SeaTunnelJobInstanceDto> queryJobInstanceListPaging(
             Date startTime,
             Date endTime,
             String jobDefineName,
+            String executorName,
+            String stateType,
             JobMode jobMode) {
         return jobInstanceMapper.queryJobInstanceListPaging(
-                page, startTime, endTime, jobDefineName, jobMode);
+                page, startTime, endTime, jobDefineName, executorName, stateType, jobMode);
     }
 
     @Override
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/mapper/JobInstanceMapper.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/mapper/JobInstanceMapper.java
index 29777153d..d4fd8ef2d 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/mapper/JobInstanceMapper.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/mapper/JobInstanceMapper.java
@@ -37,6 +37,8 @@ IPage<SeaTunnelJobInstanceDto> queryJobInstanceListPaging(
             @Param("startTime") Date startTime,
             @Param("endTime") Date endTime,
             @Param("jobDefineName") String jobDefineName,
+            @Param("executorName") String executorName,
+            @Param("stateType") String stateType,
             @Param("jobMode") JobMode jobMode);
 
     JobInstance getJobExecutionStatus(@Param("jobInstanceId") Long jobInstanceId);
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/TaskInstanceServiceImpl.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/TaskInstanceServiceImpl.java
index d40b69ad0..666c58e70 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/TaskInstanceServiceImpl.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/TaskInstanceServiceImpl.java
@@ -86,7 +86,13 @@ public Result<PageInfo<SeaTunnelJobInstanceDto>> getSyncTaskInstancePaging(
 
         IPage<SeaTunnelJobInstanceDto> jobInstanceIPage =
                 jobInstanceDao.queryJobInstanceListPaging(
-                        new Page<>(pageNo, pageSize), startDate, endDate, jobDefineName, jobMode);
+                        new Page<>(pageNo, pageSize),
+                        startDate,
+                        endDate,
+                        jobDefineName,
+                        executorName,
+                        stateType,
+                        jobMode);
 
         List<SeaTunnelJobInstanceDto> records = jobInstanceIPage.getRecords();
         if (CollectionUtils.isEmpty(records)) {
diff --git a/seatunnel-server/seatunnel-app/src/main/resources/org/apache/seatunnel/app/dal/mapper/JobInstanceMapper.xml b/seatunnel-server/seatunnel-app/src/main/resources/org/apache/seatunnel/app/dal/mapper/JobInstanceMapper.xml
index 9e4d661cc..022566dfd 100644
--- a/seatunnel-server/seatunnel-app/src/main/resources/org/apache/seatunnel/app/dal/mapper/JobInstanceMapper.xml
+++ b/seatunnel-server/seatunnel-app/src/main/resources/org/apache/seatunnel/app/dal/mapper/JobInstanceMapper.xml
@@ -49,6 +49,12 @@
             <if test="jobDefineName != null">
                 AND jd.name LIKE concat('%', #{jobDefineName}, '%')
             </if>
+            <if test="executorName != null">
+                AND cu.username LIKE concat('%', #{executorName}, '%')
+            </if>
+            <if test="stateType != null">
+                AND ji.job_status LIKE concat('%', #{stateType}, '%')
+            </if>
             <if test="jobMode != null">
                 AND ji.job_type = #{jobMode}
             </if>