Merge remote-tracking branch 'origin/main'

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/RepairCardApplyMapper.xml

@@ -77,7 +77,8 @@
             is_repair,
             device_code,
             id,
-            create_time
+            create_time,
+            att_time
         </trim>
         VALUES
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -94,6 +95,7 @@
             1,
             '补卡',
             #{idCode},
+            sysdate(),
             sysdate()
         </trim>
     </insert>

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,
@@ -59,11 +59,12 @@
     </select>
     <select id="getProRepairNum" resultType="java.lang.Integer">
         SELECT
-            count(bap.worker_id) AS proRepairNum
+            count(pp.id) AS proRepairNum
         FROM
-            bm_att_person bap
+            bm_repair_card_apply pp
+            left join bm_sub_contract bsc on pp.pro_id = bsc.pro_id
         WHERE
-            bap.sub_id = #{subId}
+            bsc.sub_id = #{subId} and pp.check_status = 1
     </select>
     <select id="getWorkerWage" resultType="com.bonus.bmw.domain.vo.ProStatisticsPo">
         SELECT

bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/WorkerStatisticsMapper.xml

@@ -39,6 +39,7 @@
     <if test="workerName != null">
       AND locate(#{workerName},pw.name)
     </if>
+      GROUP BY pw.id
   </select>
   <select id="getWorkerDetail" resultType="com.bonus.bmw.domain.vo.PmWorkerVo">
     select id,name,id_number,sex,birthday,issuing_authority,nation,start_time,end_time,address,phone
@@ -79,9 +80,9 @@
            bap.dev_name,
            bap.device_code,
            case when bap.att_time is null then 0 else 1 end as attStatus
-        from bm_worker_ein_day_record bwedr
-        left join bm_att_person bap on bwedr.ein_day = bap.att_day and bwedr.worker_id = bap.worker_id
-        where bwedr.worker_id = #{workerId}
+        from   bm_worker_ein_day_record bwedr
+        left join bm_att_person bap on bwedr.ein_day = bap.att_day and bwedr.worker_id = bap.worker_id and bwedr.pro_id = bap.pro_id
+      where bwedr.worker_id = #{workerId}
         <if test="startTime!=null and endTime!=null">
           and  bwedr.ein_day  between #{startTime} and #{endTime}
         </if>
@@ -91,6 +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,