Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Bug] Task instance filter by execution user is not working #275

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[Bug] Task instance filter by execution user is not working #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/IJobInstanceDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 3 additions & 1 deletion ...seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/impl/JobInstanceDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions ...er/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/mapper/JobInstanceMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 7 additions & 1 deletion ...nnel-app/src/main/java/org/apache/seatunnel/app/service/impl/TaskInstanceServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
6 changes: 6 additions & 0 deletions ...eatunnel-app/src/main/resources/org/apache/seatunnel/app/dal/mapper/JobInstanceMapper.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading