blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
chenlu
2024-08-27 5df5dba2a321098fd0fc7e18b71549f5c2312049 
 north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml


@@ -267,7 +267,7 @@


    </select>




    <select id="getSelectShippingOrder">


        select * from sd.delivery d


        select * from sd.delivery d left join sd.delivery_detail dd on d.delivery_id=dd.delivery_id


        <where>


            date(d.create_time)>=#{startDate} and date(d.create_time) &lt;= #{endDate}


            <if test="delivery.deliveryId != null and delivery.deliveryId != ''">


@@ -289,7 +289,7 @@


                and d.project regexp #{delivery.project}


            </if>


            <if test="delivery.orderId != null and delivery.orderId != ''">


                and d.order_id regexp #{delivery.orderId}


                and dd.order_id regexp #{delivery.orderId}


            </if>


            <if test="delivery.payMethod != null and delivery.payMethod != ''">


                and d.pay_method regexp #{delivery.payMethod}


@@ -302,6 +302,7 @@


            </if>




            </where>


        group by d.delivery_id


        order by d.id desc


        limit #{offset},#{pageSize};


    </select>