From 0050fd0d27916445fdc8cef89a78727324596443 Mon Sep 17 00:00:00 2001 From: LokerL Date: Tue, 29 Oct 2024 17:11:42 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix:=20=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E7=94=9F=E6=88=90-=E5=8E=82=E7=95=8C=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E6=A3=80=E7=B4=A2=E8=AE=BE=E5=A4=87=E5=B9=B4?= =?UTF-8?q?=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mybatis/oil/ThDeviceReportMapper.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceReportMapper.xml b/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceReportMapper.xml index ed2860b..695aab0 100644 --- a/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceReportMapper.xml +++ b/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceReportMapper.xml @@ -241,7 +241,9 @@ LEFT JOIN sys_dept p ON d.dept_id = p.dept_id WHERE d.dept_id IN (SELECT dept_id FROM sys_dept START WITH dept_id = #{deptId} - CONNECT BY PRIOR dept_id = parent_id)) + CONNECT BY PRIOR dept_id = parent_id) + AND TO_CHAR(d.create_time, 'yyyy') = #{year} + ) AND TO_CHAR(d.report_time, 'YYYY') = #{year} GROUP BY d.sn, td.address, p.dept_name, pp.dept_name, ppp.dept_name ORDER BY p.dept_name, pp.dept_name, ppp.dept_name, d.sn