bug修复

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;
     }
 
     /**

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,

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,