From 97b8ab07590e49749bac8f75cb88ebd5f0b5d047 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 9 Aug 2022 18:14:21 +0800
Subject: [PATCH] rptConfig

---
 .../mybatis/mapper/xm/core/dao/XmMenuMapper.xml        |  4 ++++
 .../mybatis/mapper/xm/core/dao/XmTaskMapper.xml        | 10 ++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml
index 38da721b..d442d9e3 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml
@@ -49,6 +49,10 @@
 				and exists(select 1 from xm_task t where  t.menu_id=res.menu_id and t.project_id=#{projectId})
 			</if>
 		</if>
+		<if test=" planStartTimeStart !=null "> and res.start_time &gt; #{planStartTimeStart} </if>
+		<if test=" planStartTimeEnd !=null "> and res.start_time &lt; #{planStartTimeEnd} </if>
+		<if test=" planEndTimeStart !=null "> and res.end_time &gt; #{planEndTimeStart} </if>
+		<if test=" planEndTimeEnd !=null "> and res.end_time &lt; #{planEndTimeEnd} </if>
 		<if test="key != null and key !='' ">  and res.menu_name like #{key}     </if>
 		<if test="isTop!=null and isTop!=''">  and (res.pmenu_id is null )</if>
 		<if test=" linkProjectId!=null and linkProjectId!=''">  and
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml
index 60bd9ccb..7d71c857 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml
@@ -27,8 +27,14 @@
 				find_in_set(#{item},res.tag_ids)
 			</foreach>
 		</if>
-		<if test=" createTimeStart !=null "> and res.create_time &gt; #{createTimeStart} </if>
-		<if test=" createTimeEnd !=null "> and res.create_time &lt; #{createTimeEnd} </if>
+		<if test=" planStartTimeStart !=null "> and res.start_time &gt; #{planStartTimeStart} </if>
+		<if test=" planStartTimeEnd !=null "> and res.start_time &lt; #{planStartTimeEnd} </if>
+		<if test=" planEndTimeStart !=null "> and res.end_time &gt; #{planEndTimeStart} </if>
+		<if test=" planEndTimeEnd !=null "> and res.end_time &lt; #{planEndTimeEnd} </if>
+		<if test=" actStartTimeStart !=null "> and res.act_start_time &gt; #{actStartTimeStart} </if>
+		<if test=" actStartTimeEnd !=null "> and res.act_start_time &lt; #{actStartTimeEnd} </if>
+		<if test=" actEndTimeStart !=null "> and res.act_end_time &gt; #{actEndTimeStart} </if>
+		<if test=" actEndTimeEnd !=null "> and res.act_end_time &lt; #{actEndTimeEnd} </if>
 		<if test="parent != null and parent != ''"> and (res.parent_taskid = '' or res.parent_taskid IS NULL)</if>
 		<if test="pidPathsLike">
 			and res.pid_paths like concat(#{pidPathsLike},'%')