工程打印标签调整

chenlu

2024-11-25 b97e00dae4fa017c8273e41fb0f24cf7c7c69a33

 north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml

@@ -51,7 +51,7 @@

                where date(d.create_time)>=#{startDate} and date(d.create_time) <= #{endDate}
                and d.customer_id = #{orderDetail.order.customerId}
        group by od.order_id,od.product_id
        group by dd.delivery_id,od.order_id,od.product_id
        limit #{offset},#{pageSize};
    </select>

@@ -65,7 +65,7 @@
        where
             date(d.create_time)>=#{startDate} and date(d.create_time) &lt;= #{endDate}
            and d.customer_id = #{orderDetail.order.customerId}
        group by od.order_id,od.product_id) as zu
        group by dd.delivery_id,od.order_id,od.product_id) as zu
    </select>

    <select id="getSelectCustomerOderDate" >
@@ -242,7 +242,7 @@
        where date(d.create_time) >= #{startDate}
          and date(d.create_time) &lt;= #{endDate}
          and d.customer_id = #{orderDetail.order.customerId}
        group by od.order_id,od.product_id
        group by dd.delivery_id,od.order_id,od.product_id

        UNION ALL

@@ -268,6 +268,27 @@
          and d.customer_id = #{orderDetail.order.customerId}
          and om.money is not null
        group by d.delivery_id, o.order_id, om.`column`

        UNION ALL

        select d.delivery_id,
               d.order_id,
               d.customer_name,
               d.project,
               '运费'           as product_name,
               d.freight_quantity    as quantity,
               0                   as area,
               d.freight_price    as price,
               d.freight        as money,
               date(d.create_time) as create_time

        from sd.delivery d

        where date(d.create_time) >= #{startDate}
          and date(d.create_time) &lt;= #{endDate}
          and d.customer_id = #{orderDetail.order.customerId}
          and d.freight >0
        group by d.delivery_id
    </select>

    <select id="exportSelectCustomerOderDate" >