ERP_override.git

			@@ -142,11 +142,17 @@

			</select>
			<select id="getProjectList">
			select * from(select project,salesman_id,salesman,contacts,contact_number,id from sd.`order`
			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">
			@@ -279,6 +285,7 @@
			and date(d.create_time) <= #{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
			@@ -318,7 +325,7 @@
			where date(o.create_time) >= #{startDate}
			and date(o.create_time) <= #{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
			@@ -338,7 +345,9 @@
			where date(o.create_time) >= #{startDate}
			and date(o.create_time) <= #{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>