From 763995ab79da05548f4516e1b57ac51fd1671673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com>
Date: Tue, 21 Oct 2025 11:28:13 +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

---
 .../bmw/service/impl/WorkerStatisticsServiceImpl.java | 11 ++++++++++-
 .../main/resources/mapper/bmw/SubStatisticsMapper.xml |  2 +-
 .../resources/mapper/bmw/WorkerStatisticsMapper.xml   |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/WorkerStatisticsServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/WorkerStatisticsServiceImpl.java
index a6de998..39df3c6 100644
--- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/WorkerStatisticsServiceImpl.java
+++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/WorkerStatisticsServiceImpl.java
@@ -70,7 +70,16 @@ public class WorkerStatisticsServiceImpl implements WorkerStatisticsService {
      */
     @Override
     public List<BmWorkerEinDayRecordVo> getWorkerEinDayRecordDetail(PmWorker pmWorker) {
-        return mapper.getWorkerEinDayRecordDetail(pmWorker);
+        List<BmWorkerEinDayRecordVo> list = mapper.getWorkerEinDayRecordDetail(pmWorker);
+        //因为补卡的时候deviceCode存的是补卡，这里直接置空
+        if (list.size()>0){
+            for (BmWorkerEinDayRecordVo bmWorkerEinDayRecordVo:list) {
+                if ("1".equals(bmWorkerEinDayRecordVo.getIsRepair())){
+                    bmWorkerEinDayRecordVo.setDeviceCode(null);
+                }
+            }
+        }
+        return list;
     }
 
     /**
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 504973b..50aa639 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
@@ -26,7 +26,7 @@
     </select>
     <select id="getEinNumByHis" resultType="com.bonus.bmw.domain.vo.ProStatisticsPo">
         SELECT
-            count(pp.worker_id) AS einNumHis,
+            count(Distinct pp.worker_id) AS einNumHis,
             min(pp.ein_time) as einTime,
             max(pp.exit_time) as exitTime,
             sum(if(ein_status=2 and is_upload_file = 1,1,0)) as exitUploadFile,
diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/WorkerStatisticsMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/WorkerStatisticsMapper.xml
index f606f8c..5d8b854 100644
--- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/WorkerStatisticsMapper.xml
+++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/WorkerStatisticsMapper.xml
@@ -92,7 +92,7 @@
       <if test="subId != null">
           AND bwedr.sub_id = #{subId}
       </if>
-
+       Order by bwedr.ein_day desc
   </select>
   <select id="getMonthTableDetail" resultType="com.bonus.bmw.domain.vo.ProMonthTable">
     select  tpmt.table_month,