From c0a9f70dc2192da1f5e7c9d5a4d02c258ef9b003 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 08 四月 2026 17:18:20 +0800
Subject: [PATCH] feat(product-structure): 新增按父节点筛选的产品结构查询接口
---
src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml b/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
index d9ddde7..b7339b0 100644
--- a/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
+++ b/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
@@ -52,24 +52,45 @@
</select>
<select id="pageProductionAccounting"
resultType="com.ruoyi.production.dto.SalesLedgerProductionAccountingDto">
+
SELECT
slpa.scheduling_user_id,
- slpa.scheduling_user_name,
- sum(ppout.quantity) as output_num,
- sum(slpa.finished_num * work_hours) as wages,
+ MIN(slpa.scheduling_user_name) AS scheduling_user_name,
+
+ SUM(ppout.quantity) AS output_num,
+
+ SUM(slpa.finished_num * slpa.work_hours) AS wages,
+
CONCAT(
ROUND(
CASE
WHEN SUM(ppout.quantity) = 0 OR SUM(ppout.quantity) IS NULL THEN 0
ELSE SUM(slpa.finished_num) * 100.0 / SUM(ppout.quantity)
- END,
- 2
+ END, 2
),
'%'
- ) as output_rate
+ ) AS output_rate,
+ GROUP_CONCAT(
+ CONCAT(
+ IFNULL(
+ TIMESTAMPDIFF(MINUTE, ppm.start_time, ppm.end_time),
+ 0
+ ),
+ '|$|',
+ IFNULL(ppm.device_name, '鏈煡鏈哄彴')
+ )
+ ORDER BY ppm.start_time
+ SEPARATOR '>>>'
+ ) AS device_work_info
+
FROM sales_ledger_production_accounting slpa
- LEFT JOIN production_product_main ppm ON slpa.product_main_id = ppm.id
- LEFT JOIN production_product_output ppout ON ppm.id = ppout.product_main_id
+
+ LEFT JOIN production_product_main ppm
+ ON slpa.product_main_id = ppm.id
+
+ LEFT JOIN production_product_output ppout
+ ON ppm.id = ppout.product_main_id
+
<where>
<if test="ew.schedulingUserName != null and ew.schedulingUserName !=''">
and slpa.scheduling_user_name = #{ew.schedulingUserName}
@@ -84,7 +105,7 @@
</if>
</where>
- GROUP BY slpa.scheduling_user_name
+ GROUP BY slpa.scheduling_user_id
</select>
--
Gitblit v1.9.3