bug修改

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

@@ -118,15 +118,13 @@
         LEFT JOIN bm_att_person bap ON bap.pro_id = pp.id AND pst.id = bap.team_id AND bap.att_day = #{startDate}
     WHERE
       pp.id = #{proId}
-      AND pp.is_active = 1
+      AND pp.is_active = 1 and pst.id is not null
     <if test="subName != null and subName != ''">
       AND ps.sub_name = #{subName}
     </if>
     <if test="teamName != null and teamName != ''">
       AND pst.team_name = #{teamName}
     </if>
-
-
     GROUP BY
     pst.id
   </select>

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

@@ -107,7 +107,7 @@
   <select id="getWorkerWage" resultType="com.bonus.bmw.domain.vo.ProStatisticsPo">
     SELECT
       sum(pp.net_salary) AS salaryMoneyNum,
-      sum(pp.id) AS payrollNum,
+      count(pp.id) AS payrollNum,
       sum(pp.pay_num) AS payrollWorkerTime
     FROM
         tb_pro_month_table pp

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

@@ -285,11 +285,13 @@
             pp.pro_name proName,
             count( distinct brca.id ) num,
             count( distinct brcr.worker_id ) personNum,
-            sum( brcr.repair_day ) days,
+            count(DISTINCT bap.att_day) days,
             brca.create_time createTime
         FROM
             bm_repair_card_apply brca
                 LEFT JOIN bm_repair_card_record brcr ON brca.id = brcr.apply_id
+                LEFT JOIN bm_att_person bap ON brca.pro_id = bap.pro_id
+                AND bap.is_repair = 1
                 LEFT JOIN pm_project pp ON pp.id = brca.pro_id
         WHERE
             brca.is_active = 1