From 52aff49523f7359961288f41297694dc5c3a0602 Mon Sep 17 00:00:00 2001 From: Yangk Date: Wed, 11 Mar 2026 13:28:13 +0800 Subject: [PATCH] =?UTF-8?q?fix(oa):=20=E4=BF=AE=E5=A4=8D=E5=B7=A5=E6=97=B6?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E6=8E=92=E9=99=A4=E9=A1=B9=E7=9B=AE=E7=B1=BB=E5=88=AB=E4=B8=BA?= =?UTF-8?q?'9'=E7=9A=84=E9=A1=B9=E7=9B=AE=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/oa/erp/ErpTimesheetReportMapper.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpTimesheetReportMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpTimesheetReportMapper.xml index 986c7546..0264bab6 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpTimesheetReportMapper.xml +++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpTimesheetReportMapper.xml @@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) global_stats ON p.project_id = global_stats.project_id p.del_flag = '0' - AND p.project_category <> '9' + AND p.project_category <> '9' AND p.project_name LIKE concat('%', #{bo.projectName}, '%') @@ -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' AND ti.dept_id = #{deptId} @@ -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' AND ti.start_time >= #{startTime}