新增签到月份检索,加班时间折算,项目数据月份检索,
This commit is contained in:
@@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
|
||||
|
||||
<select id="selectVoListAndTime" resultType="com.ruoyi.oa.domain.vo.SysOaAttendanceVo">
|
||||
select ANY_VALUE(id),
|
||||
SELECT ANY_VALUE(id),
|
||||
user_id,
|
||||
ANY_VALUE(attendance_day),
|
||||
project_id,
|
||||
@@ -109,15 +109,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
ANY_VALUE(update_by),
|
||||
ANY_VALUE(remark),
|
||||
ANY_VALUE(del_flag),
|
||||
count(*) as count,
|
||||
sum(day_length) as work_times,
|
||||
sum(hour) as hour_work_times
|
||||
from sys_oa_attendance soa
|
||||
where user_id = #{userId}
|
||||
and #{lastDay} > create_time
|
||||
and create_time > #{firstDay}
|
||||
and del_flag = '0'
|
||||
group by soa.project_id
|
||||
count(id) AS count,
|
||||
SUM(day_length) + CEILING(SUM(hour) / 9) AS work_times,
|
||||
(SUM(day_length) + CEILING(SUM(hour) / 9)) * 9 AS hour_work_times,
|
||||
FLOOR(SUM(hour) / 9) AS overTime
|
||||
FROM sys_oa_attendance soa
|
||||
WHERE user_id = #{userId}
|
||||
AND #{lastDay} > create_time
|
||||
AND create_time > #{firstDay}
|
||||
AND del_flag = '0'
|
||||
GROUP BY soa.project_id
|
||||
|
||||
</select>
|
||||
|
||||
<select id="selectUserListAndAttendanceListAndProjectListByUserIds"
|
||||
|
||||
Reference in New Issue
Block a user