pom还原

Cui Zhi Feng

2024-09-12 dca76cdb096746f78e3b728e48bf985d517fce3c

 src/main/resources/mapper/payment/DeliveryOrderMapper.xml

@@ -79,13 +79,16 @@
    </select>

    <select id="selectSupplierDoList4Check" resultType="com.mzl.flower.dto.response.payment.DeliveryOrderList4CheckDTO">
        SELECT tt.id, tt.supplierName, tt.supplierTel, tt.stationName, sum(tt.num) totalNum, sum(tt.amount) totalAmount
        SELECT tt.id, tt.supplierName, tt.supplierTel, tt.stationName, sum(tt.num) totalNum
            , sum(tt.amount) totalAmount, sum(tt.uncheckedCount) uncheckedCount
        from (
            select s.id, s.name supplierName, s.contact_tel supplierTel, st.name stationName
            , (select sum(num) from t_order_item oi
                where oi.supplier_id = q.supplier_id and oi.order_id = q.order_id) num
            ,  (select sum(oi.supplier_price * oi.num) from t_order_item oi
            , (select sum(oi.supplier_price * oi.num) from t_order_item oi
                where oi.supplier_id = q.supplier_id and oi.order_id = q.order_id) amount
            , (select count(1) from t_delivery_order dor
                where dor.id = q.id and dor.status != 'CHECKED') uncheckedCount
            from t_supplier_info s
            join t_station st on st.id = s.station_id
            join t_delivery_order q on s.id = q.supplier_id
@@ -98,8 +101,12 @@
        <if test="condition.orderNo != null and condition.orderNo != ''">
            AND q.order_no LIKE concat('%', #{condition.orderNo},'%')
        </if>
        <if test="condition.status != null and condition.status != ''">
            AND q.status = #{condition.status}

        <if test="condition.statusList != null and condition.statusList.size > 0">
            AND q.status in
            <foreach collection="condition.statusList" item="status" open="(" separator="," close=")">
                #{status}
            </foreach>
        </if>

        <if test="condition.supplierId != null">
@@ -148,8 +155,12 @@
        <if test="condition.orderNo != null and condition.orderNo != ''">
            AND q.order_no LIKE concat('%', #{condition.orderNo},'%')
        </if>
        <if test="condition.status != null and condition.status != ''">
            AND q.status = #{condition.status}

        <if test="condition.statusList != null and condition.statusList.size > 0">
            AND q.status in
            <foreach collection="condition.statusList" item="status" open="(" separator="," close=")">
                #{status}
            </foreach>
        </if>

        <if test="condition.warehouseId != null">