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

首页数据修正，添加外出记录模快

Browse Source
This commit is contained in:
hdka
2025-03-21 11:28:09 +08:00
parent 5445f0d3fd
commit 3b2b82e249
14 changed files with 149 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ruoyi-oa/src/main/resources/mapper/oa/SysOaProjectMapper.xml
View File

@@ -96,12 +96,30 @@
</select>
<select id="getProjectDataByMonth" resultType="com.ruoyi.oa.domain.vo.SysOaProjectVo">
select sum(soa.day_length + soa.hour / 8) as labor_cost, color, sop.project_name
from sys_oa_project sop
left join sys_oa_attendance soa on sop.project_id = soa.project_id
where soa.create_time between #{firstDay} and #{lastDay}
and soa.del_flag = '0'
group by sop.project_id
SELECT sop.project_id,
sop.project_name,
sop.color,
COALESCE(SUM(soa.day_length + soa.hour / 9),1) AS labor_cost,
SUM(
CASE
WHEN sof.finance_type = 0 THEN sod.price
ELSE 0
END
) AS total_price
FROM sys_oa_project AS sop
LEFT JOIN sys_oa_attendance AS soa
ON sop.project_id = soa.project_id
AND soa.create_time BETWEEN #{firstDay} AND #{lastDay}
AND soa.del_flag = '0'
LEFT JOIN sys_oa_finance AS sof
ON sop.project_id = sof.project_id
AND sof.create_time BETWEEN #{firstDay} AND #{lastDay}
LEFT JOIN sys_oa_detail AS sod
ON sof.finance_id = sod.finance_id
AND sod.create_time BETWEEN #{firstDay} AND #{lastDay}
GROUP BY sop.project_id,
sop.project_name,
sop.color
</select>
<select id="getProjectDataByMonthAndDate" resultType="com.ruoyi.oa.domain.vo.SysOaProjectVo">