Merge branch 'master' of http://sinata.cn:10101/gitblit/r/java/HongRuiTang

zhanglin8526

2023-05-10 39748c770c83ff1b1e4593c5f24b147361e587c0

 ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/AgencyTaskMapper.xml

@@ -13,23 +13,23 @@
        <result property="taskStatus"    column="task_status"    />
    </resultMap>

    <select id="pageMerAgencyTask" resultType="com.ruoyi.shop.domain.vo.MerAgencyPageVo">
    <select id="pageMerAgencyTask" resultType="com.ruoyi.shop.domain.vo.MerAgencyTaskPageVo">
        SELECT
        task_id taskId,
        task_date taskDate,
        task_content taskContent
        FROM t_agency_task tat
        WHERE delFlag = 0 AND shop_id = #{param.shopId} AND agency_id = #{param.agencyId}
        <if test="param.taskStatus!=null and param.taskStatus!=null == 0">
        WHERE del_flag = 0 AND shop_id = #{param.shopId} AND agency_id = #{param.agencyId}
        <if test="param.taskStatus!=null and param.taskStatus == 0">
            AND task_status = 0 AND task_date &lt; #{param.nowDay}
        </if>
        <if test="param.taskStatus!=null and param.taskStatus!=null == 1">
        <if test="param.taskStatus!=null and param.taskStatus == 1">
            AND task_status = 0 AND task_date = #{param.nowDay}
        </if>
        <if test="param.taskStatus!=null and param.taskStatus!=null == 2">
        <if test="param.taskStatus!=null and param.taskStatus == 2">
            AND task_status = 2
        </if>
        <if test="param.taskStatus!=null and param.taskStatus!=null == 3">
        <if test="param.taskStatus!=null and param.taskStatus == 3">
            AND task_status = 0 AND task_date &gt; #{param.nowDay}
        </if>
        ORDER BY task_date DESC