|
|
|
|
@ -45,7 +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'
|
|
|
|
|
AND p.project_category <> '9'
|
|
|
|
|
<if test="bo.projectName != null and bo.projectName != ''">
|
|
|
|
|
AND p.project_name LIKE concat('%', #{bo.projectName}, '%')
|
|
|
|
|
</if>
|
|
|
|
|
@ -92,7 +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'
|
|
|
|
|
AND p.project_category <> '9'
|
|
|
|
|
<if test="deptId != null">
|
|
|
|
|
AND ti.dept_id = #{deptId}
|
|
|
|
|
</if>
|
|
|
|
|
@ -112,9 +112,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
|
COALESCE(SUM(tp.hours), 0) AS totalHours
|
|
|
|
|
FROM erp_timesheet_project tp
|
|
|
|
|
JOIN erp_timesheet_info ti ON tp.timesheet_id = ti.timesheet_id AND ti.del_flag = '0'
|
|
|
|
|
JOIN erp_project_info p ON tp.project_id = p.project_id AND p.del_flag = '0'
|
|
|
|
|
WHERE ti.timesheet_status = '3'
|
|
|
|
|
AND tp.del_flag = '0'
|
|
|
|
|
AND p.project_category <> '9'
|
|
|
|
|
AND p.project_category <> '9'
|
|
|
|
|
<if test="startTime != null and startTime != ''">
|
|
|
|
|
AND ti.start_time >= #{startTime}
|
|
|
|
|
</if>
|
|
|
|
|
|