From 241c070c3c94b95afab38545e7a5aa8daa6d7326 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Fri, 24 Oct 2025 09:39:43 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/bmw/ProStatisticsMapper.xml | 3 ++- .../src/main/resources/mapper/bmw/SubStatisticsMapper.xml | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/ProStatisticsMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/ProStatisticsMapper.xml index 0e0ad78..ae390b6 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/ProStatisticsMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/ProStatisticsMapper.xml @@ -286,7 +286,8 @@ bap.team_name, bwepr.post_name, count(DISTINCT bap.id) AS attNumHis, - count(DISTINCT IF(bap.is_repair = 1, bap.id, null)) AS repairNumHis + count(DISTINCT IF(bap.is_repair = 1, bap.id, null)) AS repairNumHis, + bap.worker_id as workerId FROM bm_att_person bap INNER JOIN pm_worker pw ON pw.id = bap.worker_id diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/SubStatisticsMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/SubStatisticsMapper.xml index 3055b07..c697134 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/SubStatisticsMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/SubStatisticsMapper.xml @@ -70,7 +70,7 @@ SELECT sum(tpmtr.actual_money) AS salaryMoneyNum, count(DISTINCT tpmtr.month_id) as payrollNum, - sum(tpmtr.id) AS payrollWorkerTime + count(tpmtr.id) AS payrollWorkerTime FROM tb_pro_month_table_roster tpmtr WHERE @@ -244,7 +244,8 @@ bap.team_name, bwepr.post_name, count( DISTINCT bap.worker_id) AS attNumHis, - sum(DISTINCT IF(bap.is_repair = 1, 1, 0)) AS repairNumHis + sum(DISTINCT IF(bap.is_repair = 1, 1, 0)) AS repairNumHis, + bap.worker_id as workerId FROM bm_att_person bap INNER JOIN pm_worker pw ON pw.id = bap.worker_id