!245 直播记录排班

Merge pull request !245 from 德仔/xzj

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysLiveSchedul.java

@@ -0,0 +1,83 @@
+package com.stdiet.custom.domain;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.stdiet.common.annotation.Excel;
+import com.stdiet.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 直播排班对象 sys_live_schedul
+ *
+ * @author xzj
+ * @date 2021-05-12
+ */
+@Data
+public class SysLiveSchedul extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 直播间序号 */
+    @Excel(name = "直播间序号")
+    private Integer liveRoom;
+
+    /** 排班日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "排班日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date liveSchedulDate;
+
+    /** 直播开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @Excel(name = "直播开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date liveStartTime;
+
+    /** 直播结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @Excel(name = "直播结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date liveEndTime;
+
+    /** 直播营养师 */
+    @Excel(name = "直播营养师")
+    private Long liveNutritionistId;
+
+    /** 直播运营 */
+    @Excel(name = "直播运营")
+    private Long liveOperatorId;
+
+    /** 直播策划 */
+    @Excel(name = "直播策划")
+    private Long livePlannerId;
+
+    /** 微信账号管理的进粉渠道 */
+    @Excel(name = "微信账号管理的进粉渠道")
+    private Integer fanChannel;
+
+    /** 直播状态，0未开播  1已开播  2已下播 */
+    @Excel(name = "直播状态，0未开播  1已开播  2已下播")
+    private Long liveStatus;
+
+    /** 删除标识，默认0 */
+    private Integer delFlag;
+
+    //微信账号ID
+    private Long wxAccountId;
+
+    //直播间名称
+    private String liveRoomName;
+
+    private String liveNutritionistName;
+
+    private String livePlannerName;
+
+    private String liveOperatorName;
+
+    private String fanChannelName;
+
+    private List<Map<String,Object>> wxAccountList;
+}

stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysLiveSchedulMapper.java

@@ -0,0 +1,80 @@
+package com.stdiet.custom.mapper;
+
+import java.util.List;
+import com.stdiet.custom.domain.SysLiveSchedul;
+
+/**
+ * 直播排班Mapper接口
+ *
+ * @author xzj
+ * @date 2021-05-12
+ */
+public interface SysLiveSchedulMapper
+{
+    /**
+     * 查询直播排班
+     *
+     * @param id 直播排班ID
+     * @return 直播排班
+     */
+    public SysLiveSchedul selectSysLiveSchedulById(Long id);
+
+    /**
+     * 查询直播排班列表
+     *
+     * @param sysLiveSchedul 直播排班
+     * @return 直播排班集合
+     */
+    public List<SysLiveSchedul> selectSysLiveSchedulList(SysLiveSchedul sysLiveSchedul);
+
+    /**
+     * 新增直播排班
+     *
+     * @param sysLiveSchedul 直播排班
+     * @return 结果
+     */
+    public int insertSysLiveSchedul(SysLiveSchedul sysLiveSchedul);
+
+    /**
+     * 修改直播排班
+     *
+     * @param sysLiveSchedul 直播排班
+     * @return 结果
+     */
+    public int updateSysLiveSchedul(SysLiveSchedul sysLiveSchedul);
+
+    /**
+     * 删除直播排班
+     *
+     * @param id 直播排班ID
+     * @return 结果
+     */
+    public int deleteSysLiveSchedulById(Long id);
+
+    /**
+     * 批量删除直播排班
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSysLiveSchedulByIds(Long[] ids);
+
+    /**
+     * 根据直播时间查询是否重叠
+     */
+    public SysLiveSchedul getLiveSchedulByLiveTime(SysLiveSchedul sysLiveSchedul);
+
+    /**
+     * 更新部分字段
+     * @param sysLiveSchedul
+     * @return
+     */
+    public int updateSysLiveSchedulById(SysLiveSchedul sysLiveSchedul);
+
+    /**
+     * 根据ID查询上一条记录
+     * @param sysLiveSchedul
+     * @return
+     */
+    public SysLiveSchedul getLastLiveSchedulById(SysLiveSchedul sysLiveSchedul);
+}

stdiet-custom/src/main/java/com/stdiet/custom/service/ISysLiveSchedulService.java

@@ -0,0 +1,80 @@
+package com.stdiet.custom.service;
+
+import java.util.List;
+import com.stdiet.custom.domain.SysLiveSchedul;
+
+/**
+ * 直播排班Service接口
+ *
+ * @author xzj
+ * @date 2021-05-12
+ */
+public interface ISysLiveSchedulService
+{
+    /**
+     * 查询直播排班
+     *
+     * @param id 直播排班ID
+     * @return 直播排班
+     */
+    public SysLiveSchedul selectSysLiveSchedulById(Long id);
+
+    /**
+     * 查询直播排班列表
+     *
+     * @param sysLiveSchedul 直播排班
+     * @return 直播排班集合
+     */
+    public List<SysLiveSchedul> selectSysLiveSchedulList(SysLiveSchedul sysLiveSchedul);
+
+    /**
+     * 新增直播排班
+     *
+     * @param sysLiveSchedul 直播排班
+     * @return 结果
+     */
+    public int insertSysLiveSchedul(SysLiveSchedul sysLiveSchedul);
+
+    /**
+     * 修改直播排班
+     *
+     * @param sysLiveSchedul 直播排班
+     * @return 结果
+     */
+    public int updateSysLiveSchedul(SysLiveSchedul sysLiveSchedul);
+
+    /**
+     * 批量删除直播排班
+     *
+     * @param ids 需要删除的直播排班ID
+     * @return 结果
+     */
+    public int deleteSysLiveSchedulByIds(Long[] ids);
+
+    /**
+     * 删除直播排班信息
+     *
+     * @param id 直播排班ID
+     * @return 结果
+     */
+    public int deleteSysLiveSchedulById(Long id);
+
+    /**
+     * 根据直播时间查询是否重叠
+     */
+    public SysLiveSchedul getLiveSchedulByLiveTime(SysLiveSchedul sysLiveSchedul);
+
+    /**
+     * 更新部分字段
+     * @param sysLiveSchedul
+     * @return
+     */
+    public int updateSysLiveSchedulById(SysLiveSchedul sysLiveSchedul);
+
+    /**
+     * 根据ID查询上一条记录
+     * @param sysLiveSchedul
+     * @return
+     */
+    public SysLiveSchedul getLastLiveSchedulById(SysLiveSchedul sysLiveSchedul);
+}

stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysLiveSchedulServiceImpl.java

@@ -0,0 +1,126 @@
+package com.stdiet.custom.service.impl;
+
+import java.util.List;
+import com.stdiet.common.utils.DateUtils;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.stdiet.custom.mapper.SysLiveSchedulMapper;
+import com.stdiet.custom.domain.SysLiveSchedul;
+import com.stdiet.custom.service.ISysLiveSchedulService;
+
+/**
+ * 直播排班Service业务层处理
+ *
+ * @author xzj
+ * @date 2021-05-12
+ */
+@Service
+public class SysLiveSchedulServiceImpl implements ISysLiveSchedulService
+{
+    @Autowired
+    private SysLiveSchedulMapper sysLiveSchedulMapper;
+
+    /**
+     * 查询直播排班
+     *
+     * @param id 直播排班ID
+     * @return 直播排班
+     */
+    @Override
+    public SysLiveSchedul selectSysLiveSchedulById(Long id)
+    {
+        return sysLiveSchedulMapper.selectSysLiveSchedulById(id);
+    }
+
+    /**
+     * 查询直播排班列表
+     *
+     * @param sysLiveSchedul 直播排班
+     * @return 直播排班
+     */
+    @Override
+    public List<SysLiveSchedul> selectSysLiveSchedulList(SysLiveSchedul sysLiveSchedul)
+    {
+        return sysLiveSchedulMapper.selectSysLiveSchedulList(sysLiveSchedul);
+    }
+
+    /**
+     * 新增直播排班
+     *
+     * @param sysLiveSchedul 直播排班
+     * @return 结果
+     */
+    @Override
+    public int insertSysLiveSchedul(SysLiveSchedul sysLiveSchedul)
+    {
+        sysLiveSchedul.setCreateTime(DateUtils.getNowDate());
+        return sysLiveSchedulMapper.insertSysLiveSchedul(sysLiveSchedul);
+    }
+
+    /**
+     * 修改直播排班
+     *
+     * @param sysLiveSchedul 直播排班
+     * @return 结果
+     */
+    @Override
+    public int updateSysLiveSchedul(SysLiveSchedul sysLiveSchedul)
+    {
+        sysLiveSchedul.setUpdateTime(DateUtils.getNowDate());
+        return sysLiveSchedulMapper.updateSysLiveSchedul(sysLiveSchedul);
+    }
+
+    /**
+     * 批量删除直播排班
+     *
+     * @param ids 需要删除的直播排班ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSysLiveSchedulByIds(Long[] ids)
+    {
+        return sysLiveSchedulMapper.deleteSysLiveSchedulByIds(ids);
+    }
+
+    /**
+     * 删除直播排班信息
+     *
+     * @param id 直播排班ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSysLiveSchedulById(Long id)
+    {
+        return sysLiveSchedulMapper.deleteSysLiveSchedulById(id);
+    }
+
+    /**
+     * 根据直播时间查询是否重叠
+     */
+    @Override
+    public SysLiveSchedul getLiveSchedulByLiveTime(SysLiveSchedul sysLiveSchedul){
+        return sysLiveSchedulMapper.getLiveSchedulByLiveTime(sysLiveSchedul);
+    }
+
+    /**
+     * 更新部分字段
+     * @param sysLiveSchedul
+     * @return
+     */
+    @Override
+    public int updateSysLiveSchedulById(SysLiveSchedul sysLiveSchedul){
+        sysLiveSchedul.setUpdateTime(DateUtils.getNowDate());
+        return sysLiveSchedulMapper.updateSysLiveSchedulById(sysLiveSchedul);
+    }
+
+    /**
+     * 根据ID查询上一条记录
+     * @param sysLiveSchedul
+     * @return
+     */
+    @Override
+    public SysLiveSchedul getLastLiveSchedulById(SysLiveSchedul sysLiveSchedul){
+        return sysLiveSchedulMapper.getLastLiveSchedulById(sysLiveSchedul);
+    }
+}

stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderPauseServiceImpl.java

@@ -98,10 +98,13 @@ public class SysOrderPauseServiceImpl implements ISysOrderPauseService
     public int deleteSysOrderPauseByIds(Long[] ids)
     {
         SysOrderPause sysOrderPause = selectSysOrderPauseById(ids[0]);
-        if(sysOrderPauseMapper.deleteSysOrderPauseByIds(ids) > 0){
-            return sysOrderService.updateOrderServerStartEndDate(sysOrderPause.getCusId());
+        int row = sysOrderPauseMapper.deleteSysOrderPauseByIds(ids);
+        if(row > 0){
+            if(sysOrderPause != null && sysOrderPause.getCusId() != null){
+                sysOrderService.updateOrderServerStartEndDate(sysOrderPause.getCusId());
+            }
         }
-        return 0;
+        return row;
     }
 
     /**

stdiet-custom/src/main/resources/mapper/custom/SysLiveSchedulMapper.xml

@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stdiet.custom.mapper.SysLiveSchedulMapper">
+
+    <resultMap type="SysLiveSchedul" id="SysLiveSchedulResult">
+        <result property="id"    column="id"    />
+        <result property="liveRoom"    column="live_room"    />
+        <result property="liveSchedulDate"    column="live_schedul_date"    />
+        <result property="liveStartTime"    column="live_start_time"    />
+        <result property="liveEndTime"    column="live_end_time"    />
+        <result property="liveNutritionistId"    column="live_nutritionist_id"    />
+        <result property="liveOperatorId"    column="live_operator_id"    />
+        <result property="livePlannerId"    column="live_planner_id"    />
+        <result property="fanChannel"    column="fan_channel"    />
+        <result property="liveStatus"    column="live_status"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="delFlag"    column="del_flag"    />
+
+        <result property="liveRoomName" column="live_room_name"></result>
+        <result property="liveNutritionistName" column="live_nutritionist_name"></result>
+        <result property="livePlannerName" column="live_planner_name"></result>
+        <result property="liveOperatorName" column="live_operator_name"></result>
+        <result property="fanChannelName"  column="fan_channel_name"></result>
+
+        <!-- 根据渠道查询对应微信号（微信账号分配表中） -->
+        <association property="wxAccountList" column="fan_channel" select="getWxAccountListByFanChannel"/>
+    </resultMap>
+
+    <resultMap type="SysLiveSchedul" id="SysLiveSchedulResultSigle">
+        <result property="id"    column="id"    />
+        <result property="liveRoom"    column="live_room"    />
+        <result property="liveSchedulDate"    column="live_schedul_date"    />
+        <result property="liveStartTime"    column="live_start_time"    />
+        <result property="liveEndTime"    column="live_end_time"    />
+        <result property="liveNutritionistId"    column="live_nutritionist_id"    />
+        <result property="liveOperatorId"    column="live_operator_id"    />
+        <result property="livePlannerId"    column="live_planner_id"    />
+        <result property="fanChannel"    column="fan_channel"    />
+        <result property="liveStatus"    column="live_status"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="delFlag"    column="del_flag"    />
+    </resultMap>
+
+    <sql id="selectSysLiveSchedulVo">
+        id, live_room, live_schedul_date,live_start_time, live_end_time, live_nutritionist_id, live_operator_id, live_planner_id, fan_channel, live_status, create_time, create_by, update_time, update_by, del_flag
+    </sql>
+
+    <select id="selectSysLiveSchedulList" parameterType="SysLiveSchedul" resultMap="SysLiveSchedulResult">
+        select
+        slc.id, slc.live_room, slc.live_schedul_date,slc.live_start_time, slc.live_end_time, slc.live_nutritionist_id, slc.live_operator_id, slc.live_planner_id, slc.fan_channel, slc.live_status, slc.create_time, slc.create_by
+        ,slt.dict_label as live_room_name,su_nutritionist.nick_name as live_nutritionist_name, su_plan.nick_name as live_planner_name,
+        su_operator.nick_name as live_operator_name,fc.dict_label as fan_channel_name
+        from sys_live_schedul slc
+        left join (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'sys_live_type') AS slt ON slt.dict_value = slc.live_room
+        left join (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'fan_channel') AS fc ON fc.dict_value = slc.fan_channel
+        left join sys_user su_nutritionist on su_nutritionist.user_id = slc.live_nutritionist_id and su_nutritionist.del_flag = 0
+        left join sys_user su_plan on su_plan.user_id = slc.live_planner_id and su_plan.del_flag = 0
+        left join sys_user su_operator on su_operator.user_id = slc.live_operator_id and su_operator.del_flag = 0
+        where slc.del_flag = 0
+        <if test="liveSchedulDate != null">
+            and date_format(slc.live_schedul_date,'%y%m%d') = date_format(#{liveSchedulDate},'%y%m%d')
+        </if>
+        <if test="liveRoom != null">
+            and slc.live_room = #{liveRoom}
+        </if>
+        <if test="fanChannel != null">
+            and slc.fan_channel = #{fanChannel}
+        </if>
+        <if test="wxAccountId != null">
+            and slc.fan_channel = (SELECT swd.account_id FROM sys_wx_distribution AS swd where swd.wechat_account = #{wxAccountId} and swd.del_flag = 0 limit 1)
+        </if>
+        order by slc.live_schedul_date desc,slc.live_start_time desc ,slc.live_room asc
+    </select>
+
+    <select id="selectSysLiveSchedulById" parameterType="Long" resultMap="SysLiveSchedulResultSigle">
+        select
+        <include refid="selectSysLiveSchedulVo"/>
+        from sys_live_schedul
+        where id = #{id} and del_flag = 0
+    </select>
+
+    <insert id="insertSysLiveSchedul" parameterType="SysLiveSchedul" useGeneratedKeys="true" keyProperty="id">
+        insert into sys_live_schedul
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="liveRoom != null">live_room,</if>
+            <if test="liveSchedulDate != null">live_schedul_date,</if>
+            <if test="liveStartTime != null">live_start_time,</if>
+            <if test="liveEndTime != null">live_end_time,</if>
+            <if test="liveNutritionistId != null">live_nutritionist_id,</if>
+            <if test="liveOperatorId != null">live_operator_id,</if>
+            <if test="livePlannerId != null">live_planner_id,</if>
+            <if test="fanChannel != null">fan_channel,</if>
+            <if test="liveStatus != null">live_status,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="delFlag != null">del_flag,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="liveRoom != null">#{liveRoom},</if>
+            <if test="liveSchedulDate != null">#{liveSchedulDate},</if>
+            <if test="liveStartTime != null">#{liveStartTime},</if>
+            <if test="liveEndTime != null">#{liveEndTime},</if>
+            <if test="liveNutritionistId != null">#{liveNutritionistId},</if>
+            <if test="liveOperatorId != null">#{liveOperatorId},</if>
+            <if test="livePlannerId != null">#{livePlannerId},</if>
+            <if test="fanChannel != null">#{fanChannel},</if>
+            <if test="liveStatus != null">#{liveStatus},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+        </trim>
+    </insert>
+
+    <update id="updateSysLiveSchedul" parameterType="SysLiveSchedul">
+        update sys_live_schedul
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="liveRoom != null">live_room = #{liveRoom},</if>
+            <if test="liveSchedulDate != null">live_schedul_date = #{liveSchedulDate},</if>
+            <if test="liveStartTime != null">live_start_time = #{liveStartTime},</if>
+            <if test="liveEndTime != null">live_end_time = #{liveEndTime},</if>
+            <if test="liveNutritionistId != null">live_nutritionist_id = #{liveNutritionistId},</if>
+            <if test="liveOperatorId != null">live_operator_id = #{liveOperatorId},</if>
+            <if test="livePlannerId != null">live_planner_id = #{livePlannerId},</if>
+            <if test="fanChannel != null">fan_channel = #{fanChannel},</if>
+            <if test="liveStatus != null">live_status = #{liveStatus},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="updateSysLiveSchedulById" parameterType="SysLiveSchedul">
+        update sys_live_schedul set live_room = #{liveRoom},live_schedul_date = #{liveSchedulDate},live_start_time = #{liveStartTime},
+        live_end_time = #{liveEndTime},live_nutritionist_id = #{liveNutritionistId},live_operator_id = #{liveOperatorId},live_planner_id = #{livePlannerId},
+        fan_channel = #{fanChannel},live_status = #{liveStatus},update_time = #{updateTime}
+        where id = #{id}
+    </update>
+
+    <update id="deleteSysLiveSchedulById" parameterType="Long">
+        update sys_live_schedul set del_flag = 1 where id = #{id}
+    </update>
+
+    <update id="deleteSysLiveSchedulByIds" parameterType="String">
+        update sys_live_schedul set del_flag = 1 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+    <!-- 根据渠道查询该渠道下分配的微信号 -->
+    <select id="getWxAccountListByFanChannel" parameterType="Integer" resultType="Map">
+      SELECT su.nick_name as nickName,swsa.wx_account as wxAccount,asg.dict_label as saleGroupName
+      FROM sys_wx_distribution AS swd
+      lEFT JOIN sys_wx_sale_account swsa ON swsa.id = swd.wechat_account and swsa.del_flag = 0
+      LEFT JOIN sys_user su ON su.user_id = swd.user_id AND su.del_flag = 0
+      LEFT JOIN (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'sale_group') AS asg ON asg.dict_value = swd.sale_group_id
+      where swd.account_id = #{fan_channel} and swd.del_flag = 0
+    </select>
+
+    <!-- 查询直播时间范围是否重叠 -->
+    <select id="getLiveSchedulByLiveTime" parameterType="SysLiveSchedul" resultMap="SysLiveSchedulResultSigle">
+        select
+        <include refid="selectSysLiveSchedulVo"/>
+        from sys_live_schedul
+        where live_room = #{liveRoom} and del_flag = 0
+        AND (
+          (#{liveStartTime} >= live_start_time AND live_end_time > #{liveStartTime})
+          <if test="liveEndTime != null">
+              OR (#{liveEndTime} > live_start_time AND live_end_time >= #{liveEndTime})
+          </if>
+        )
+        limit 1
+    </select>
+
+    <select id="getLastLiveSchedulById" parameterType="SysLiveSchedul" resultMap="SysLiveSchedulResultSigle">
+        select
+        <include refid="selectSysLiveSchedulVo"/>
+        from sys_live_schedul
+        where id <![CDATA[ < ]]> #{id} and del_flag = 0 and live_room = #{liveRoom}  order by live_start_time desc limit 1
+    </select>
+</mapper>

stdiet-custom/src/main/resources/mapper/custom/SysOrderPauseMapper.xml

@@ -114,8 +114,8 @@
     <!-- 根据用户ID、时间范围查询数量 -->
     <select id="getCountByCusIdAndPauseDate" parameterType="SysOrderPause" resultType="int">
         select count(id) from sys_recipes_pause where del_flag = 0 and cus_id = #{cusId}
-        AND (#{pauseStartDate} >= pause_start_date AND pause_end_date >= #{pauseStartDate}
-        OR #{pauseEndDate} >= pause_start_date AND pause_end_date >= #{pauseEndDate})
+        AND ((#{pauseStartDate} >= pause_start_date AND pause_end_date >= #{pauseStartDate})
+        OR (#{pauseEndDate} >= pause_start_date AND pause_end_date >= #{pauseEndDate}))
         <if test="id != null">
             and id <![CDATA[ <> ]]> #{id}
         </if>