区间查询修改
This commit is contained in:
parent
fab9e03421
commit
e9523d17ad
|
|
@ -1788,7 +1788,7 @@
|
||||||
</foreach>
|
</foreach>
|
||||||
</if>
|
</if>
|
||||||
<if test="settlementStatus != null and settlementStatus != ''">
|
<if test="settlementStatus != null and settlementStatus != ''">
|
||||||
AND bai.is_slt = #{settlementStatus}
|
AND sai.is_slt = #{settlementStatus}
|
||||||
</if>
|
</if>
|
||||||
<if test="unitName != null and unitName != ''">
|
<if test="unitName != null and unitName != ''">
|
||||||
AND bu.unit_name LIKE CONCAT('%', #{unitName}, '%')
|
AND bu.unit_name LIKE CONCAT('%', #{unitName}, '%')
|
||||||
|
|
@ -1818,7 +1818,7 @@
|
||||||
))
|
))
|
||||||
OR
|
OR
|
||||||
<!-- 未结算协议:租赁期间与查询区间有交集 -->
|
<!-- 未结算协议:租赁期间与查询区间有交集 -->
|
||||||
((bai.is_slt = 0 OR bai.is_slt IS NULL) AND (
|
((sai.is_slt = 0 OR bai.is_slt IS NULL) AND (
|
||||||
<!-- 情况1:领料时间在查询区间内 -->
|
<!-- 情况1:领料时间在查询区间内 -->
|
||||||
(sai.start_time IS NOT NULL AND DATE(sai.start_time) >= #{startDate} AND DATE(sai.start_time) <= DATE(#{endDate}))
|
(sai.start_time IS NOT NULL AND DATE(sai.start_time) >= #{startDate} AND DATE(sai.start_time) <= DATE(#{endDate}))
|
||||||
OR
|
OR
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue