|
@@ -17,8 +17,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
t1.deleted = 0 and t2.is_submit = 1
|
|
t1.deleted = 0 and t2.is_submit = 1
|
|
<if test="formCode != null and formCode != ''"> AND t1.form_code like concat('%', #{formCode}, '%')</if>
|
|
<if test="formCode != null and formCode != ''"> AND t1.form_code like concat('%', #{formCode}, '%')</if>
|
|
<if test="lotCode != null and lotCode != ''"> AND t1.lot_code like concat('%', #{lotCode}, '%')</if>
|
|
<if test="lotCode != null and lotCode != ''"> AND t1.lot_code like concat('%', #{lotCode}, '%')</if>
|
|
- <if test="startTime != null ">AND t1.form_date > #{startTime}</if>
|
|
|
|
- <if test="endTime != null ">AND t1.form_date < #{endTime}</if>
|
|
|
|
|
|
+ <if test="startTime != null ">AND t1.form_date >= #{startTime}</if>
|
|
|
|
+ <if test="endTime != null ">AND t1.form_date <= #{endTime}</if>
|
|
<if test="supplierId != null "> AND t1.supplier_id = #{supplierId}</if>
|
|
<if test="supplierId != null "> AND t1.supplier_id = #{supplierId}</if>
|
|
<if test="supplierName != null and supplierName != ''"> AND t1.supplier_name like concat('%', #{supplierName}, '%')</if>
|
|
<if test="supplierName != null and supplierName != ''"> AND t1.supplier_name like concat('%', #{supplierName}, '%')</if>
|
|
<if test="deliveryMethod != null "> AND t1.delivery_method = #{deliveryMethod}</if>
|
|
<if test="deliveryMethod != null "> AND t1.delivery_method = #{deliveryMethod}</if>
|