ERP_override.git

			@@ -15,6 +15,7 @@
			<result column="project" property="order.project"/>
			<result column="area" property="order.area"/>
			<result column="creator" property="order.creator"/>
			<result column="customer_name" property="order.customerName"/>
			<!-- <association property="orderDetail" javaType="com.example.erp.entity.sd.OrderDetail">-->
			<!-- <result column="product_id" property="productId"/>-->
			<!-- <result column="product_name" property="productName"/>-->
			@@ -37,7 +38,8 @@
			o.order_type,
			o.area as gross_area,
			o.quantity as quantity,
			o.creator
			o.creator,
			o.customer_name
			from sd.order_detail as od
			left join `order` as o
			on o.order_id=od.order_id
			@@ -55,6 +57,9 @@
			</if>
			<if test="orderGlassDetail.order.orderType != null and orderGlassDetail.order.orderType!= ''">
			and o.order_type regexp #{orderGlassDetail.order.orderType}
			</if>
			<if test="orderGlassDetail.order.customerName != null and orderGlassDetail.order.customerName!= ''">
			and o.customer_name regexp #{orderGlassDetail.order.customerName}
			</if>

			<if test="orderGlassDetail.createTime != ''">
			@@ -79,7 +84,8 @@
			(od.gross_area) as gross_area,
			(od.quantity) as quantity,
			o.creator,
			od.id
			od.id,
			o.customer_name
			from sd.order_glass_detail as ogd
			left join order_detail as od
			on od.order_id=ogd.order_id
			@@ -103,6 +109,9 @@
			<if test="orderGlassDetail.order.orderType != null and orderGlassDetail.order.orderType!= ''">
			and o.order_type regexp #{orderGlassDetail.order.orderType}
			</if>
			<if test="orderGlassDetail.order.customerName != null and orderGlassDetail.order.customerName!= ''">
			and o.customer_name regexp #{orderGlassDetail.order.customerName}
			</if>

			<if test="orderGlassDetail.createTime != ''">
			and DATE_FORMAT((o.create_time),'%Y-%m-%d') BETWEEN #{ selectTime1 } AND #{ selectTime2 }