From 812f2de34b5713c4da08932d95e634de81e9b248 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 20 六月 2026 19:52:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

---
 src/main/resources/mapper/production/ProductionAccountMapper.xml |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductionAccountMapper.xml b/src/main/resources/mapper/production/ProductionAccountMapper.xml
index 4be1c23..d66347f 100644
--- a/src/main/resources/mapper/production/ProductionAccountMapper.xml
+++ b/src/main/resources/mapper/production/ProductionAccountMapper.xml
@@ -124,8 +124,10 @@
         select date_format(scheduling_date, '%m-%d') as dateStr,
                cast(ifnull(sum(finished_num), 0) as decimal(18,2)) as numberOfCompleted,
                cast(ifnull(sum(work_hours), 0) as decimal(18,2)) as amount,
-               cast(0 as decimal(18,2)) as passRate
+               cast(sum(ppo.quantity) / sum(ppo.quantity + ppo.scrap_qty) * 100.00 as decimal(18,2)) as passRate
         from production_account
+        left join production_product_main ppm on ppm.id = production_account.production_product_main_id
+        left join production_product_output ppo on ppo.production_product_main_id = ppm.id
         where scheduling_date &gt;= #{startDate}
           and scheduling_date &lt;= #{endDate}
         group by date_format(scheduling_date, '%m-%d')

--
Gitblit v1.9.3