This is an automated email from the ASF dual-hosted git repository.

caishunfeng pushed a commit to branch 3.1.0-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git

commit 34950d3c091cbd624c4b1440d057bae640a8e46b
Author: juzimao <[email protected]>
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 aa13818213..9f06888793 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
@@ -184,7 +184,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}
@@ -228,7 +231,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}, '%')

Reply via email to