ERP_override.git

			@@ -17,7 +17,7 @@
			<update id="updateOrderParameter">
			update `order` o
			left join
			(select a.order_id,sum(a.perimeter) as aa,sum(a.quantity) as b,sum(a.compute_gross_area) as c
			(select a.order_id,round(sum(a.perimeter),2) as aa,sum(a.quantity) as b,sum(a.compute_gross_area) as c
			from sd.order_detail as a group by a.order_id) od
			on o.order_id = od.order_id
			set
			@@ -31,9 +31,12 @@

			<select id="getOrderList">
			select
			*
			*,
			sum(fgi.quantity_available) as goodsQuantity
			from
			`order` as o
			left join mm.finished_goods_inventory as fgi
			on o.order_id = fgi.order_id
			where date(o.create_time)>=#{startDate} and date(o.create_time) <= #{endDate}

			<if test="orderType!= null and orderType != ''">
			@@ -91,7 +94,7 @@
			<if test="order.deliveryAddress != null and order.deliveryAddress != ''">
			and o.delivery_address REGEXP #{order.deliveryAddress}
			</if>

			group by o.id
			order by o.id desc
			limit #{offset},#{pageSize}
			</select>