DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增文件预览列表修复了任务显示ossId但是无法现在的情况

Browse Source 
新增项目编号索引
This commit is contained in:
hdka
2025-05-20 09:11:45 +08:00
parent a0bc26ef3a
commit 1715aa3639
32 changed files with 592 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ruoyi-oa/src/main/resources/mapper/oa/SysOaAttendanceMapper.xml
View File

@@ -266,43 +266,21 @@
SELECT m.month,
ROUND(
COUNT(
DISTINCT CASE
WHEN a.project_id NOT IN (0, 1)
THEN CONCAT(a.user_id, '_', DATE(a.create_time))
END
)
/
NULLIF(
COUNT(
DISTINCT CASE
WHEN a.project_id != 0
THEN a.user_id
END
)
*
COUNT(
DISTINCT CASE
WHEN a.project_id != 0
THEN DATE(a.create_time)
END
),
0
),
4
COUNT(DISTINCT CASE
WHEN a.project_id NOT IN (0, 1)
THEN CONCAT(a.user_id, '_', DATE(a.create_time)) END) /
NULLIF(COUNT(DISTINCT CASE WHEN a.project_id != 0 THEN a.user_id END) *
COUNT(DISTINCT CASE WHEN a.project_id != 0 THEN DATE(a.create_time) END), 0), 4
) AS attendanceRate,
SUM(CASE WHEN a.project_id = 0 THEN 1 ELSE 0 END) AS tripCount,
COUNT(CASE WHEN a.project_id = 1 THEN 1 END) AS leavePeople,
SUM(CASE
WHEN a.project_id NOT IN (0, 1)
AND IFNULL(a.hour, 0) > 8
THEN IFNULL(a.hour, 0) - 8
ELSE 0
END) AS overtimeHours
FROM (SELECT DATE_FORMAT(#{refDate}, '%Y-%m') AS month,
LAST_DAY(#{refDate}) AS last_day,
CASE