ERP_override.git

			@@ -17,6 +17,7 @@
			<result column="area" property="order.area"/>
			<result column="creator" property="order.creator"/>
			<result column="customer_name" property="order.customerName"/>
			<result column="processing_note" property="order.processingNote"/>
			<!-- <association property="orderDetail" javaType="com.example.erp.entity.sd.OrderDetail">-->
			<!-- <result column="product_id" property="productId"/>-->
			<!-- <result column="product_name" property="productName"/>-->
			@@ -27,6 +28,7 @@
			<!-- <result column="bend_radius" property="bendRadius"/>-->
			<!-- <result column="processing_note" property="processingNote"/>-->
			<result column="gross_area" property="orderDetail.grossArea"/>

			<!-- </association>-->

			</resultMap>
			@@ -40,7 +42,8 @@
			o.area as gross_area,
			o.quantity as quantity,
			o.creator,
			o.customer_name
			o.customer_name,
			o.processing_note
			from sd.order_detail as od
			left join `order` as o
			on o.order_id=od.order_id
			@@ -61,6 +64,9 @@
			</if>
			<if test="orderGlassDetail.order.customerName != null and orderGlassDetail.order.customerName!= ''">
			and o.customer_name regexp #{orderGlassDetail.order.customerName}
			</if>
			<if test="orderGlassDetail.order.processingNote != null and orderGlassDetail.order.processingNote!= ''">
			and o.processing_note regexp #{orderGlassDetail.order.processingNote}
			</if>

			<if test="orderGlassDetail.createTime != ''">
			@@ -87,7 +93,8 @@
			(od.quantity) as quantity,
			o.creator,
			od.id,
			o.customer_name
			o.customer_name,
			o.processing_note
			from sd.order_glass_detail as ogd
			left join order_detail as od
			on od.order_id=ogd.order_id
			@@ -114,6 +121,9 @@
			<if test="orderGlassDetail.order.customerName != null and orderGlassDetail.order.customerName!= ''">
			and o.customer_name regexp #{orderGlassDetail.order.customerName}
			</if>
			<if test="orderGlassDetail.order.processingNote != null and orderGlassDetail.order.processingNote!= ''">
			and o.processing_note regexp #{orderGlassDetail.order.processingNote}
			</if>

			<if test="orderGlassDetail.createTime != ''">
			and DATE_FORMAT((o.create_time),'%Y-%m-%d') BETWEEN #{ selectTime1 } AND #{ selectTime2 }
			@@ -132,7 +142,7 @@
			from sd.order_detail as od
			left join sd.order as o
			on od.order_id =o.order_id
			where od.order_id = #{orderId} and o.production_order!=2
			where FIND_IN_SET(od.order_id,#{orderId}) and o.production_order!=2
			<if test="orderDetail.orderId != null and orderDetail.orderId != ''">
			and od.order_id regexp #{orderDetail.orderId}
			</if>