ufo / ufo-platform · Commits

Go to a project

Authored by min.ling
Commit e8b787286db1f0c9622fa97db992eb9509535651 1 parent ff823129

fix:订单列表sku筛选项

Inline Side-by-side
Showing 2 changed files with 7 additions and 3 deletions
... ... @@ -122,6 +122,9 @@
<if test="buyerOrderReq.skup != null and buyerOrderReq.skup != 0 ">
and c.id = #{buyerOrderReq.skup}
</if>
<if test="buyerOrderReq.storageId != null and buyerOrderReq.storageId != 0 ">
and c.storage_id = #{buyerOrderReq.storageId}
</if>
<if test="buyerOrderReq.depotNo != null">
and c.depot_no = #{buyerOrderReq.depotNo}
</if>
... ... @@ -155,7 +158,7 @@
<select id="selectTotalByCondition" resultType="java.lang.Integer" parameterType="com.yoho.order.model.BuyerOrderReq">
select count(a.id)
from buyer_order a
<if test="(buyerOrderReq.depotNo != null) or (buyerOrderReq.productId != null) or (buyerOrderReq.skup != null)">
<if test="(buyerOrderReq.depotNo != null) or (buyerOrderReq.productId != null) or (buyerOrderReq.skup != null) or (buyerOrderReq.storageId != null)">
LEFT JOIN buyer_order_goods b
ON( b.order_code=a.order_code)
LEFT JOIN seller_order_goods c
... ... @@ -176,7 +179,7 @@
<select id="selectByCondition" resultMap="BaseResultMap" parameterType="com.yoho.order.model.BuyerOrderReq">
select a.*
from buyer_order a
<if test="(buyerOrderReq.depotNo != null) or (buyerOrderReq.productId != null) or (buyerOrderReq.skup != null)">
<if test="(buyerOrderReq.depotNo != null) or (buyerOrderReq.productId != null) or (buyerOrderReq.skup != null) or (buyerOrderReq.storageId != null)">
LEFT JOIN buyer_order_goods b
ON( b.order_code=a.order_code)
LEFT JOIN seller_order_goods c
... ...
... ... @@ -171,7 +171,8 @@ $(function() {
clientType : $("#clientType").myCombobox("getValue"),
attributes : $("#attributes").myCombobox("getValue"),
buyerStartTime : new Date($('#buyerStartTime').datetimebox('getValue')).getTime(),
buyerEndTime : new Date($('#buyerEndTime').datetimebox('getValue')).getTime()
buyerEndTime : new Date($('#buyerEndTime').datetimebox('getValue')).getTime(),
storageId: $("#sku").val()
});
}
});
... ...