From 33d93225f790ff72f8ba5e86f8cf2c3e2db94d0d Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 26 三月 2026 10:43:55 +0800
Subject: [PATCH] feat: 新增宽、高、面积，产品加工绑定
---
src/main/java/com/ruoyi/sales/mapper/SalesLedgerMapper.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/mapper/SalesLedgerMapper.java b/src/main/java/com/ruoyi/sales/mapper/SalesLedgerMapper.java
index 3100a55..69140f3 100644
--- a/src/main/java/com/ruoyi/sales/mapper/SalesLedgerMapper.java
+++ b/src/main/java/com/ruoyi/sales/mapper/SalesLedgerMapper.java
@@ -69,7 +69,8 @@
"SUM(CASE WHEN slp.approve_status = 2 THEN 1 ELSE 0 END) / COUNT(DISTINCT sl.id) * 100), 2) AS ship_rate " +
"FROM sales_ledger sl " +
"LEFT JOIN sales_ledger_product slp ON sl.id = slp.sales_ledger_id " +
- "WHERE sl.entry_date BETWEEN #{statisticsTableDto.entryDateStart} AND #{statisticsTableDto.entryDateEnd} " +
+ "WHERE sl.entry_date >= DATE_FORMAT(#{statisticsTableDto.entryDateStart}, '%Y-%m-01') " +
+ "AND sl.entry_date <= LAST_DAY(#{statisticsTableDto.entryDateEnd}) " +
// 浜у搧澶х被绛涢��
"<if test='statisticsTableDto.productCategory != null and statisticsTableDto.productCategory != \"\"'>" +
"AND slp.product_category = #{statisticsTableDto.productCategory} " +
@@ -82,4 +83,6 @@
"ORDER BY month" +
"</script>")
List<SalesTrendDto> statisticsTable(@Param("statisticsTableDto")StatisticsTableDto statisticsTableDto);
+
+ IPage<SalesLedgerDto> listSalesLedgerAndShipped(Page page, @Param("ew") SalesLedgerDto salesLedgerDto);
}
--
Gitblit v1.9.3