From e2079ea034c7f6bb5fc096fd4d83ed9b2cc3ff13 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期日, 21 六月 2026 10:38:31 +0800
Subject: [PATCH] fix: 导入销售订单汇总修改
---
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 5235958..b2d6781 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -32,7 +32,10 @@
T2.nick_name AS entry_person_name,
T1.payment_method,
DATEDIFF(T1.delivery_date, CURDATE()) AS delivery_days_diff,
- T1.delivery_status AS deliveryStatus
+ T1.delivery_status AS deliveryStatus,
+ T1.order_status AS orderStatus,
+ T1.label_print_count AS labelPrintCount,
+ T1.document_print_count AS documentPrintCount
FROM
sales_ledger T1
LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
@@ -70,7 +73,12 @@
T1.review_status AS reviewStatus,
T1.counter_review_time AS counterReviewTime,
T1.counter_review_person AS counterReviewPerson,
- T1.counter_review_person_id AS counterReviewPersonId
+ T1.counter_review_person_id AS counterReviewPersonId,
+ T1.counter_review_type AS counterReviewType,
+ T1.counter_review_desc AS counterReviewDesc,
+ T1.order_status AS orderStatus,
+ T1.label_print_count AS labelPrintCount,
+ T1.document_print_count AS documentPrintCount
FROM sales_ledger T1
LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
<where>
@@ -111,6 +119,9 @@
OR T1.review_status IS NULL
)
</if>
+ <if test="salesLedgerDto.orderStatus != null">
+ AND T1.order_status = #{salesLedgerDto.orderStatus}
+ </if>
<if test="salesLedgerDto.width != null or salesLedgerDto.height != null">
AND EXISTS (
SELECT 1
--
Gitblit v1.9.3