Merge remote-tracking branch 'origin/master'

maven

昨天 9fb6f5adf9f63deffd377c001aaab8ffeae4c742

 src/main/resources/mapper/lavorissue/LavorIssueMapper.xml

@@ -53,7 +53,25 @@
                and t1.adopted_date is null
            </if>
            <if test="req.issueDate != null">
                and t1.issue_date &lt; #{req.issueDate}
                and (t1.issue_date &gt;= #{req.startDate} and t1.issue_date &lt;= #{req.endDate})
            </if>
            <if test="req.staffId != null">
                and t1.staff_id = #{req.staffId}
            </if>
            <if test="req.season != null and req.season != ''">
                and (t1.issue_date &gt;= #{req.startDate} and t1.issue_date &lt;= #{req.endDate})
            </if>
            <if test="req.status != null and req.status == 1">
                and t1.adopted_date is not null
            </if>
            <if test="req.status != null and req.status == 2">
                and t1.adopted_date is null
            </if>
            <if test="req.status != null and req.status == 3">
                and t1.adopted_date is not null and t1.issue_date &lt; t1.adopted_date
            </if>
            <if test="req.status != null and req.status == 4">
                and t1.adopted_date is null and t1.issue_date &lt; current_date()
            </if>
        </where>
    </select>