You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ca...@apache.org on 2022/09/19 09:50:32 UTC
[dolphinscheduler] branch dev updated: and task instance date range search (#11963)
This is an automated email from the ASF dual-hosted git repository.
caishunfeng pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new c8884e4f2f and task instance date range search (#11963)
c8884e4f2f is described below
commit c8884e4f2f86b2be3c3b41042bae7e5218b9b33d
Author: juzimao <57...@qq.com>
AuthorDate: Mon Sep 19 17:50:24 2022 +0800
and task instance date range search (#11963)
---
.../apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
index dafcc98953..2505773b33 100644
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
@@ -185,7 +185,10 @@
left join t_ds_process_instance process on process.id=instance.process_instance_id
where define.project_code = #{projectCode}
<if test="startTime != null">
- and instance.start_time > #{startTime} and instance.start_time <![CDATA[ <=]]> #{endTime}
+ and instance.start_time <![CDATA[ >=]]> #{startTime}
+ </if>
+ <if test="endTime != null">
+ and instance.start_time <![CDATA[ <=]]> #{endTime}
</if>
<if test="processInstanceId != 0">
and instance.process_instance_id = #{processInstanceId}
@@ -229,7 +232,10 @@
left join t_ds_process_definition process on process.code=relation.process_definition_code and process.version = relation.process_definition_version
where define.project_code = #{projectCode}
<if test="startTime != null">
- and instance.start_time > #{startTime} and instance.start_time <![CDATA[ <=]]> #{endTime}
+ and instance.start_time <![CDATA[ >=]]> #{startTime}
+ </if>
+ <if test="endTime != null">
+ and instance.start_time <![CDATA[ <=]]> #{endTime}
</if>
<if test="searchVal != null and searchVal != ''">
and instance.name like concat('%', #{searchVal}, '%')