From 1db111fdf6c65fa1debadf648e4c22bd466744f8 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 18 六月 2026 16:59:29 +0800
Subject: [PATCH] feat: 设备台账上传图片
---
src/main/resources/mapper/sales/SalesLedgerProductMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index 0df9c91..c8b0226 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -24,7 +24,7 @@
AND T1.type = #{salesLedgerProduct.type}
</if>
</where>
- ORDER BY T1.register_date DESC
+ ORDER BY T1.register_date ASC,T1.id ASC
</select>
<select id="selectSalesLedgerProductByMainId" resultType="com.ruoyi.sales.pojo.SalesLedgerProduct">
@@ -166,7 +166,7 @@
resultType="com.ruoyi.purchase.dto.ProcurementBusinessSummaryStatisticsDto">
SELECT
COALESCE(SUM(slp.tax_inclusive_total_price), 0) AS purchaseTotalAmount,
- COALESCE(COUNT(DISTINCT slp.product_category), 0) AS productCategoryCount,
+ COALESCE(COUNT(DISTINCT slp.product_model_id), 0) AS productCategoryCount,
COALESCE(SUM(rop.allocated_return_amount), 0) AS returnTotalAmount
FROM sales_ledger_product slp
LEFT JOIN purchase_ledger sl ON slp.sales_ledger_id = sl.id
--
Gitblit v1.9.3