考勤统计调整

src/main/java/com/xjrsoft/module/attendance/controller/StatisticsController.java

@@ -95,7 +95,6 @@ public class StatisticsController {
             if(ruleCategory != null){
                 dto.setRuleCategoryId(ruleCategory.getId());
             }
-
         }
 
         //查询总人数

src/main/resources/mapper/attendance/TeacherAttendanceRecordMapper.xml

@@ -49,7 +49,7 @@
             inner join xjr_user_dept_relation t3 on t2.id = t3.user_id
             and t3.dept_id = #{dto.deptId}
         </if>
-
+        INNER JOIN attendance_user_relation t4 ON t1.user_id = t4.user_id
         WHERE t1.delete_mark = 0
         AND DATE_FORMAT(t1.attendance_date,'%Y-%m-%d') = #{dto.date}
         AND t1.time_interval = #{dto.timePeriod}
@@ -65,7 +65,9 @@
         <if test="dto.attendanceMode != null and dto.attendanceMode != ''">
             and t1.attendance_mode like concat('%', #{dto.attendanceMode},'%')
         </if>
-
+        <if test="dto.ruleCategoryId != null">
+            and t4.attendance_rule_category_id = #{dto.ruleCategoryId}
+        </if>
     </select>
 
     <select id="getLeaveList" parameterType="com.xjrsoft.module.teacher.entity.WfTeacherleave" resultType="com.xjrsoft.module.attendance.entity.TeacherAttendanceRecord">