是否下发查询;
This commit is contained in:
+6
-6
@@ -416,10 +416,10 @@
|
||||
and a.ORDER_DATE = #{orderDate}
|
||||
</if>
|
||||
<if test="createTimeStart != null and createTimeStart != ''">
|
||||
and date_format(a.create_time,'%Y-%m-%d') >= #{createTimeStart}
|
||||
and a.create_time >= #{createTimeStart}
|
||||
</if>
|
||||
<if test="createTimeEnd != null and createTimeEnd != ''">
|
||||
and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeEnd}
|
||||
and a.create_time <![CDATA[ < ]]> date_add(#{createTimeEnd}, interval 1 day)
|
||||
</if>
|
||||
<if test="pushTimeStart != null">
|
||||
and PUSH_TIME <![CDATA[>=]]> #{pushTimeStart}
|
||||
@@ -443,16 +443,16 @@
|
||||
and a.create_by_name like concat('%', #{createByName}, '%')
|
||||
</if>
|
||||
<if test="storageTimeStart != null and storageTimeStart != ''">
|
||||
and date_format(a.storage_time,'%Y-%m-%d') >= #{storageTimeStart}
|
||||
and a.storage_time >= #{storageTimeStart}
|
||||
</if>
|
||||
<if test="storageTimeEnd != null and storageTimeEnd != ''">
|
||||
and date_format(a.storage_time,'%Y-%m-%d') <= #{storageTimeEnd}
|
||||
and a.storage_time <![CDATA[ < ]]> date_add(#{storageTimeEnd}, interval 1 day)
|
||||
</if>
|
||||
<if test="expectTimeStart != null and expectTimeStart != ''">
|
||||
and date_format(a.expect_time,'%Y-%m-%d') >= #{expectTimeStart}
|
||||
and a.expect_time >= #{expectTimeStart}
|
||||
</if>
|
||||
<if test="expectTimeEnd != null and expectTimeEnd != ''">
|
||||
and date_format(a.expect_time,'%Y-%m-%d') <= #{expectTimeEnd}
|
||||
and a.expect_time <![CDATA[ < ]]> date_add(#{expectTimeEnd}, interval 1 day)
|
||||
</if>
|
||||
<if test="xfStatus != null and xfStatus != '' and xfStatus == '已下发'">
|
||||
and a.issue_time is not null
|
||||
|
||||
+8
-8
@@ -337,20 +337,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
and a.create_by_name like concat('%', #{createByName}, '%')
|
||||
</if>
|
||||
<if test="createTimeStart != null and createTimeStart != ''">
|
||||
and date_format(a.create_time,'%Y-%m-%d') >= #{createTimeStart}
|
||||
and a.create_time >= #{createTimeStart}
|
||||
</if>
|
||||
<if test="createTimeEnd != null and createTimeEnd != ''">
|
||||
and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeEnd}
|
||||
and a.create_time <![CDATA[ < ]]> date_add(#{createTimeEnd}, interval 1 day)
|
||||
</if>
|
||||
<if test="outboundDateStart != null and outboundDateStart != ''">
|
||||
and a.outbound_date >= #{outboundDateStart}
|
||||
</if>
|
||||
<if test="outboundDateEnd != null and outboundDateEnd != ''">
|
||||
and a.outbound_date <![CDATA[ < ]]> date_add(#{outboundDateEnd}, interval 1 day)
|
||||
</if>
|
||||
<if test="organizationId != null ">
|
||||
and a.organization_id = #{organizationId}
|
||||
</if>
|
||||
<if test="outboundDateStart != null and outboundDateStart != ''">
|
||||
and date_format(a.outbound_date,'%Y-%m-%d') >= #{outboundDateStart}
|
||||
</if>
|
||||
<if test="outboundDateEnd != null and outboundDateEnd != ''">
|
||||
and date_format(a.outbound_date,'%Y-%m-%d') <= #{outboundDateEnd}
|
||||
</if>
|
||||
<if test="orderTypeName != null and orderTypeName != ''">
|
||||
and (a.BUSINESS_TYPE like concat('%', #{orderTypeName}, '%') or a.ORDER_TYPE_CODE like concat('%', #{orderTypeName}, '%'))
|
||||
</if>
|
||||
|
||||
Reference in New Issue
Block a user