From 034f66c1861761fea6cf553ff4ff2c9fd564b763 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 09 四月 2024 08:20:14 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/target/classes/mapper/sd/OrderDetail.xml | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/target/classes/mapper/sd/OrderDetail.xml b/north-glass-erp/target/classes/mapper/sd/OrderDetail.xml
index 7ec4d2d..03429e3 100644
--- a/north-glass-erp/target/classes/mapper/sd/OrderDetail.xml
+++ b/north-glass-erp/target/classes/mapper/sd/OrderDetail.xml
@@ -67,11 +67,55 @@
</foreach>
</update>
-
- <select id="getOrderReport">
+
+ <resultMap id="orderMap" type="com.example.erp.entity.sd.OrderDetail">
+ <result column="order_number" property="orderNumber"/>
+
+ <result column="order_number" property="productId"/>
+ <result column="order_number" property="productName"/>
+ <result column="order_number" property="width"/>
+ <result column="order_number" property="height"/>
+ <result column="order_number" property="quantity"/>
+ <result column="order_number" property="bendRadius"/>
+ <result column="order_number" property="grossArea"/>
+ <result column="order_number" property="computeGrossArea"/>
+ <result column="order_number" property="shape"/>
+ <result column="order_number" property="edgingType"/>
+ <result column="order_number" property="processingNote"/>
+ <result column="order_number" property="remarks"/>
+ <result column="order_number" property="perimeter"/>
+ <result column="order_number" property="grossAmount"/>
+
+ <association property="order" javaType="com.example.erp.entity.sd.Order">
+ <result column="order_type" property="orderType"/>
+
+ <result column="customer_name" property="customerName"/>
+ <result column="project" property="project"/>
+ <result column="order_id" property="orderId"/>
+ <result column="batch" property="batch"/>
+ <result column="processing_note" property="processingNote"/>
+ <result column="icon" property="icon"/>
+ <result column="packType" property="packType"/>
+ <result column="salesman" property="salesman"/>
+ <result column="delivery_address" property="deliveryAddress"/>
+ <result column="creator" property="creator"/>
+ <result column="verifier" property="verifier"/>
+ <result column="customer_batch" property="customerBatch"/>
+
+
+ </association>
+
+ </resultMap>
+
+
+ <select id="getOrderReport" resultMap="orderMap">
SELECT
- from order_detail as a
- left join sd.`order` o on o.id = a.order_id
+ *
+ from order_detail as a
+ left join sd.`order` as b
+ on b.order_id = a.order_id
+ where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate}
+ limit #{offset},#{pageSize}
</select>
--
Gitblit v1.8.0