blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
guoyujie
6 天以前 8fbb9414ac41fd267691356147757602f3b6371c 
 north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml


@@ -179,9 +179,6 @@


            <if test="order.createTime != null and order.createTime != ''">


                and o.create_time REGEXP #{order.createTime}


            </if>


            <if test="order.finishedGoodsInventory.quantityAvailable != null and order.finishedGoodsInventory.quantityAvailable != ''">


                and fgi.quantity_available REGEXP #{order.finishedGoodsInventory.quantityAvailable}


            </if>


        </where>


        group by o.order_id order by o.id desc


        limit #{offset},#{pageSize};


@@ -236,9 +233,6 @@


            </if>


            <if test="order.createTime != null and order.createTime != ''">


                and o.create_time REGEXP #{order.createTime}


            </if>


            <if test="order.finishedGoodsInventory.quantityAvailable != null and order.finishedGoodsInventory.quantityAvailable != ''">


                and fgi.quantity_available REGEXP #{order.finishedGoodsInventory.quantityAvailable}


            </if>


        </where>


        group by o.order_id limit #{offset},#{pageSize}) as zu;


@@ -350,7 +344,16 @@




            </where>


        group by d.delivery_id


        order by d.id desc


        order by


        <if test="orderBy == null ">


            d.id desc


        </if>


        <if test="orderBy == 'desc'">


            d.${field} desc


        </if>


        <if test="orderBy == 'asc'">


            d.${field}


        </if>


        limit #{offset},#{pageSize};


    </select>