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 9980690..09db455 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
@@ -133,7 +133,7 @@
bsc.sub_contract_code,
bsc.sub_contract_name,
bsc.sub_ein_status,
- count(bwem.worker_id) as einNum,
+ count(DISTINCT bwem.worker_id) as einNum,
count(DISTINCT bwer.worker_id) as einNumHis,
bsc.sub_ein_time,
bsc.sub_exit_time
@@ -286,8 +286,8 @@
bap.team_id,
bap.team_name,
bwepr.post_name,
- count(bap.worker_id) AS attNumHis,
- sum(IF(bap.is_repair = 1, 1, 0)) AS repairNumHis
+ count(DISTINCT bap.id) AS attNumHis,
+ count(DISTINCT IF(bap.is_repair = 1, bap.id, null)) AS repairNumHis
FROM
bm_att_person bap
INNER JOIN pm_worker pw ON pw.id = bap.worker_id
diff --git a/bonus-modules/bonus-job/src/main/java/com/bonus/job/task/ThreeTableOneRosterTask.java b/bonus-modules/bonus-job/src/main/java/com/bonus/job/task/ThreeTableOneRosterTask.java
index 81aebd2..ea7cfcd 100644
--- a/bonus-modules/bonus-job/src/main/java/com/bonus/job/task/ThreeTableOneRosterTask.java
+++ b/bonus-modules/bonus-job/src/main/java/com/bonus/job/task/ThreeTableOneRosterTask.java
@@ -270,10 +270,8 @@ public class ThreeTableOneRosterTask {
Integer id =mapper.getProMonthDataByTable(attProMonthPo);
if(id!=null && id>0){
attProMonthPo.setId(id);
- attProMonthPo.setStatus(1);
mapper.updateProMonthData(attProMonthPo);
}else{
- attProMonthPo.setStatus(1);
mapper.insertProMonthData(attProMonthPo);
}
mapper.updateMonthId(attProMonthPo);
diff --git a/bonus-modules/bonus-job/src/main/resources/mapper/job/WorkerJobMapper.xml b/bonus-modules/bonus-job/src/main/resources/mapper/job/WorkerJobMapper.xml
index 442a40a..2f6abad 100644
--- a/bonus-modules/bonus-job/src/main/resources/mapper/job/WorkerJobMapper.xml
+++ b/bonus-modules/bonus-job/src/main/resources/mapper/job/WorkerJobMapper.xml
@@ -333,7 +333,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update tb_pro_month_table set roster_num=#{rosterNum},attendance_num=#{attendanceNum},repair_num=#{repairNum},salary_num=#{salaryNum},
- sub_num=#{subNum},team_num=#{teamNum},gross_salary=#{grossSalary},net_salary=#{netSalary},pay_num=#{payNum},status = #{status}
+ sub_num=#{subNum},team_num=#{teamNum},gross_salary=#{grossSalary},net_salary=#{netSalary},pay_num=#{payNum}
+
+ ,status = #{status}
+
where pro_id=#{proId} and table_month=#{month}
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysIpWhitelistMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysIpWhitelistMapper.xml
index 23df916..35f826e 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysIpWhitelistMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysIpWhitelistMapper.xml
@@ -23,13 +23,14 @@
@@ -97,4 +98,4 @@
where status='0'
order by created_at desc
-
\ No newline at end of file
+