diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceUbiDataMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceUbiDataMapper.xml index 61bcf44e..b05e8d9a 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceUbiDataMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceUbiDataMapper.xml @@ -230,7 +230,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and d.projectId = #{projectId} and d.sub_dept_id = #{subDeptId} and d.sub_dept_group = #{subDeptGroup} - and u.use_status = '0' and date(d.create_time) = CURDATE() + and date(d.create_time) = CURDATE() group by u.craft_type @@ -242,7 +242,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and d.projectId = #{projectId} and d.sub_dept_id = #{subDeptId} and d.sub_dept_group = #{subDeptGroup} - and date(d.create_time) between #{params.beginTime} and #{params.endTime} + and date(d.create_time) >= CURDATE() - INTERVAL 7 DAY group by attendanceTime order by attendanceTime diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/SurProjectAttendanceDataMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/SurProjectAttendanceDataMapper.xml index 5efccac3..c0b362fe 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/SurProjectAttendanceDataMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/SurProjectAttendanceDataMapper.xml @@ -674,13 +674,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"