Merge remote-tracking branch 'origin/master'

廖井涛

2025-08-25 fec9f42e00f2df68a2a20cbf132b17bdeed8e63a

 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" >
@@ -77,7 +77,7 @@
        o.customer_id,
        o.customer_name,
        sum(od.quantity) as quantity,
        sum(od.area) as area,
        sum(od.compute_gross_area) as area,
        od.shape,
        od.width,
        od.height,
@@ -115,7 +115,9 @@
            a.*,
            b.project,
            b.salesman_id,
            b.salesman
            b.salesman,
            b.contacts,
            b.contact_number
        from
            sd.customer as a
        left join (SELECT
@@ -128,6 +130,8 @@
                               o.project,
                               o.salesman_id,
                               o.salesman,
                               o.contacts,
                               o.contact_number,
                               o.customer_id
                           FROM
                               sd.ORDER AS o
@@ -137,6 +141,14 @@
        on a.id = b.customer_id

    </select>
    <select id="getProjectList">
        select * from(select project,salesman_id as salesmanId,salesman,contacts,contact_number as contactNumber,id from sd.`order`
                       where customer_id = #{id}
                      group by project
                       ) as a
              order by id desc
    </select>

    <select id="getSelectCustomer">
        select
            *
@@ -242,7 +254,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

@@ -267,7 +279,29 @@
          and date(d.create_time) &lt;= #{endDate}
          and d.customer_id = #{orderDetail.order.customerId}
          and om.money is not null
          and om.money >0
        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" >
@@ -276,7 +310,7 @@
               od.product_name,
               o.customer_name,
               sum(od.quantity)     as quantity,
               sum(od.area)         as area,
               sum(od.compute_gross_area)         as area,
               od.price,
               sum(od.gross_amount) as money,
               date(o.create_time)  as create_time
@@ -285,7 +319,7 @@
        where date(o.create_time) >= #{startDate}
          and date(o.create_time) &lt;= #{endDate}
          and o.customer_id = #{orderDetail.order.customerId}
          and o.create_order>0
          and o.order_review>0
        group by od.order_id,od.product_id

        UNION ALL
@@ -305,7 +339,9 @@
        where date(o.create_time) >= #{startDate}
          and date(o.create_time) &lt;= #{endDate}
          and o.customer_id = #{orderDetail.order.customerId}
          and o.order_review>0
          and om.money is not null
          and om.money >0
        group by o.order_id, om.`column`

    </select>