Browse Source

rptConfig

master
陈裕财 3 years ago
parent
commit
97b8ab0759
  1. 4
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml
  2. 10
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml

4
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}) and exists(select 1 from xm_task t where t.menu_id=res.menu_id and t.project_id=#{projectId})
</if> </if>
</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="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="isTop!=null and isTop!=''"> and (res.pmenu_id is null )</if>
<if test=" linkProjectId!=null and linkProjectId!=''"> and <if test=" linkProjectId!=null and linkProjectId!=''"> and

10
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml

@ -27,8 +27,14 @@
find_in_set(#{item},res.tag_ids) find_in_set(#{item},res.tag_ids)
</foreach> </foreach>
</if> </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="parent != null and parent != ''"> and (res.parent_taskid = '' or res.parent_taskid IS NULL)</if>
<if test="pidPathsLike"> <if test="pidPathsLike">
and res.pid_paths like concat(#{pidPathsLike},'%') and res.pid_paths like concat(#{pidPathsLike},'%')

Loading…
Cancel
Save