修改假期，节假日定时器

bonus-modules/bonus-system/src/main/resources/mapper/att/AttDetailByMonthMapper.xml

@@ -12,22 +12,23 @@
     </select>
 
     <select id="selectAttDetailList" resultType="com.bonus.system.att.entity.AttDetailByMonthBean">
-        select
-        user_id as userId,
-        name as name,
-        org_id as orgId,
-        org_name as orgName,
-        att_current_month as attCurrentMonth,
-        coalesce(required_days,0) as requiredDays,
-        coalesce(normal_num,0) as normalNum,
-        coalesce(late_num,0) as lateNum,
-        coalesce(early_num,0) as earlyNum,
-        coalesce(skipping_num,0) as skippingNum,
-        coalesce(leave_num,0) as leaveNum,
-        coalesce(address_error_num,0) as addressErrorNum,
-        coalesce(ein_error_num,0) as einErrorNum
-        from att_month_report amr
-        where amr.is_active = 1
+        SELECT
+        amr.user_id AS userId,
+        amr.NAME AS NAME,
+        amr.org_id AS orgId,
+        org_name AS orgName,
+        att_current_month AS attCurrentMonth,
+        COALESCE ( required_days, 0 ) AS requiredDays,
+        COALESCE ( normal_num, 0 ) AS normalNum,
+        COALESCE ( late_num, 0 ) AS lateNum,
+        COALESCE ( early_num, 0 ) AS earlyNum,
+        COALESCE ( skipping_num, 0 ) AS skippingNum,
+        COALESCE ( leave_num, 0 ) AS leaveNum,
+        COALESCE ( address_error_num, 0 ) AS addressErrorNum,
+        COALESCE ( ein_error_num, 0 ) AS einErrorNum
+        FROM att_month_report amr
+        left join att_group_person_relation p on p.user_id = amr.user_id
+        where amr.is_active = 1 and p.is_active = 1
         and amr.required_days != amr.normal_num
         <if test="attCurrentMonth != null and attCurrentMonth != '' ">
             and amr.att_current_month = #{attCurrentMonth}
@@ -41,7 +42,7 @@
         <if test="name != null and name != ''">
             AND amr.name like concat('%', #{name}, '%')
         </if>
-        group by user_id
+        group by amr.user_id
     </select>
 
     <select id="selectAttAllList" resultType="com.bonus.system.att.entity.AttDetailByMonthBean">