From f4e8f069d050293232cfe68ebd38b2b05c4ad4b4 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 12 七月 2024 11:41:30 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml b/north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml
index 1de3c6f..7a9049e 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml
@@ -8,6 +8,7 @@
<result column="order_id" property="orderId"/>
<result column="production_id" property="productionId"/>
<result column="splitting_status" property="splittingStatus"/>
+ <result column="founder" property="founder"/>
<result column="create_time" property="createTime"/>
<!--鎺ユ敹鍏朵粬澶栭敭瀹炰綋绫绘暟鎹�-->
<result column="batch" property="order.batch"/>
@@ -15,6 +16,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 +39,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
@@ -56,6 +59,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 }
@@ -73,13 +79,15 @@
o.order_id,
od.order_number,
ogd.production_id,
+ ogd.founder,
o.batch,
o.project,
o.order_type,
(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 +111,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 }
--
Gitblit v1.8.0