Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

23 分钟以前 9ccc8bd3a53160a40cf60f14e5867f6ce9f6c58f

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

@@ -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,20 @@
        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="countByCustomerName">
        SELECT COUNT(*)
        FROM sd.customer
        WHERE customer_name=#{customer.customerName}
    </select>

    <select id="getSelectCustomer">
        select
            *
@@ -267,6 +285,7 @@
          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
@@ -306,7 +325,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
@@ -326,7 +345,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>