|
|
|
|
@ -28,12 +28,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
|
LEFT JOIN sys_dept p_dept ON p.dept_id = p_dept.dept_id
|
|
|
|
|
<!-- 关联全局统计 (独立子查询,不受主查询部门条件影响) -->
|
|
|
|
|
LEFT JOIN (
|
|
|
|
|
SELECT
|
|
|
|
|
tp2.project_id,
|
|
|
|
|
SELECT
|
|
|
|
|
tp2.project_id,
|
|
|
|
|
SUM(tp2.hours) AS total_hours
|
|
|
|
|
FROM erp_timesheet_project tp2
|
|
|
|
|
JOIN erp_timesheet_info ti2 ON tp2.timesheet_id = ti2.timesheet_id AND ti2.del_flag = '0'
|
|
|
|
|
WHERE tp2.del_flag = '0'
|
|
|
|
|
WHERE tp2.del_flag = '0'
|
|
|
|
|
AND ti2.timesheet_status = '3'
|
|
|
|
|
<if test="startTime != null and startTime != ''">
|
|
|
|
|
AND ti2.start_time >= #{startTime}
|
|
|
|
|
@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
|
) global_stats ON p.project_id = global_stats.project_id
|
|
|
|
|
<where>
|
|
|
|
|
p.del_flag = '0'
|
|
|
|
|
AND p.project_category <> '9'
|
|
|
|
|
<if test="bo.projectName != null and bo.projectName != ''">
|
|
|
|
|
AND p.project_name LIKE concat('%', #{bo.projectName}, '%')
|
|
|
|
|
</if>
|
|
|
|
|
@ -91,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
|
JOIN sys_user u ON ti.user_id = u.user_id AND u.del_flag = '0'
|
|
|
|
|
WHERE ti.timesheet_status = '3'
|
|
|
|
|
AND tp.del_flag = '0'
|
|
|
|
|
AND p.project_category <> '9'
|
|
|
|
|
<if test="deptId != null">
|
|
|
|
|
AND ti.dept_id = #{deptId}
|
|
|
|
|
</if>
|
|
|
|
|
@ -112,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
|
JOIN erp_timesheet_info ti ON tp.timesheet_id = ti.timesheet_id AND ti.del_flag = '0'
|
|
|
|
|
WHERE ti.timesheet_status = '3'
|
|
|
|
|
AND tp.del_flag = '0'
|
|
|
|
|
AND p.project_category <> '9'
|
|
|
|
|
<if test="startTime != null and startTime != ''">
|
|
|
|
|
AND ti.start_time >= #{startTime}
|
|
|
|
|
</if>
|
|
|
|
|
|