Skip to content

Commit a1dcddd

Browse files
[Bug] Task instance filter by execution user is not working
1 parent a901300 commit a1dcddd

File tree

5 files changed

+20
-2
lines changed

5 files changed

+20
-2
lines changed

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/IJobInstanceDao.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ IPage<SeaTunnelJobInstanceDto> queryJobInstanceListPaging(
4545
Date startTime,
4646
Date endTime,
4747
String jobDefineId,
48+
String executorName,
49+
String stateType,
4850
JobMode jobMode);
4951

5052
List<JobInstance> getAllJobInstance(@NonNull List<Long> jobInstanceIdList);

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/impl/JobInstanceDaoImpl.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,11 @@ public IPage<SeaTunnelJobInstanceDto> queryJobInstanceListPaging(
7272
Date startTime,
7373
Date endTime,
7474
String jobDefineName,
75+
String executorName,
76+
String stateType,
7577
JobMode jobMode) {
7678
return jobInstanceMapper.queryJobInstanceListPaging(
77-
page, startTime, endTime, jobDefineName, jobMode);
79+
page, startTime, endTime, jobDefineName, executorName, stateType, jobMode);
7880
}
7981

8082
@Override

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/mapper/JobInstanceMapper.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ IPage<SeaTunnelJobInstanceDto> queryJobInstanceListPaging(
3737
@Param("startTime") Date startTime,
3838
@Param("endTime") Date endTime,
3939
@Param("jobDefineName") String jobDefineName,
40+
@Param("executorName") String executorName,
41+
@Param("stateType") String stateType,
4042
@Param("jobMode") JobMode jobMode);
4143

4244
JobInstance getJobExecutionStatus(@Param("jobInstanceId") Long jobInstanceId);

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/TaskInstanceServiceImpl.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,13 @@ public Result<PageInfo<SeaTunnelJobInstanceDto>> getSyncTaskInstancePaging(
8686

8787
IPage<SeaTunnelJobInstanceDto> jobInstanceIPage =
8888
jobInstanceDao.queryJobInstanceListPaging(
89-
new Page<>(pageNo, pageSize), startDate, endDate, jobDefineName, jobMode);
89+
new Page<>(pageNo, pageSize),
90+
startDate,
91+
endDate,
92+
jobDefineName,
93+
executorName,
94+
stateType,
95+
jobMode);
9096

9197
List<SeaTunnelJobInstanceDto> records = jobInstanceIPage.getRecords();
9298
if (CollectionUtils.isEmpty(records)) {

seatunnel-server/seatunnel-app/src/main/resources/org/apache/seatunnel/app/dal/mapper/JobInstanceMapper.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@
4949
<if test="jobDefineName != null">
5050
AND jd.name LIKE concat('%', #{jobDefineName}, '%')
5151
</if>
52+
<if test="executorName != null">
53+
AND cu.username LIKE concat('%', #{executorName}, '%')
54+
</if>
55+
<if test="stateType != null">
56+
AND ji.job_status LIKE concat('%', #{stateType}, '%')
57+
</if>
5258
<if test="jobMode != null">
5359
AND ji.job_type = #{jobMode}
5460
</if>

0 commit comments

Comments
 (0)