Merge branch 'refs/heads/master' into 分包商

This commit is contained in:
zt
2025-04-02 11:11:25 +08:00
6 changed files with 94 additions and 55 deletions

View File

@ -151,7 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and (wa.late = 0 and wa.early_leave = 0 and wa.missed_in = 0 and wa.missed_out = 0) and leave_mark_id is null
</if>
<if test="dto.attendanceType !=null and dto.attendanceType ==2 ">
AND ((wa.late = 1 OR wa.missed_in = 1 OR wa.early_leave = 1 OR wa.missed_out = 1)
AND ((wa.id is null OR wa.late = 1 OR wa.missed_in = 1 OR wa.early_leave = 1 OR wa.missed_out = 1)
AND leave_mark_id IS NULL)
</if>
<if test="dto.attendanceType !=null and dto.attendanceType ==3 ">