From 8cfb7397a14d47d11f60749103c5c3da0c5da30b Mon Sep 17 00:00:00 2001
From: niujiyi <18272501226@163.com>
Date: Thu, 20 Aug 2026 16:27:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=9D=A3=E7=AB=AF-=E8=81=94=E5=90=88?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EnforcementRegistrationReportMapper.xml   | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/report/EnforcementRegistrationReportMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/report/EnforcementRegistrationReportMapper.xml
index 02e4b2c8..fdc1ca79 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/report/EnforcementRegistrationReportMapper.xml
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/report/EnforcementRegistrationReportMapper.xml
@@ -141,6 +141,34 @@
         AND r2.check_category IS NOT NULL
         AND r2.bureau_dept_id IS NOT NULL
         AND (r2.status = 0 OR r2.status IS NULL)
+        <!-- dateType: 1=本月, 2=本季度, 3=本年 -->
+        <if test="bo.dateType != null and bo.dateType == 1">
+            AND DATE_FORMAT(r2.enforcement_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m')
+        </if>
+        <if test="bo.dateType != null and bo.dateType == 2">
+            AND DATE_FORMAT(r2.enforcement_time, '%Y-%m') &gt;= CONCAT(YEAR(CURDATE()), '-',
+            CASE WHEN QUARTER(CURDATE()) IN (1) THEN '01'
+            WHEN QUARTER(CURDATE()) IN (2) THEN '04'
+            WHEN QUARTER(CURDATE()) IN (3) THEN '07'
+            ELSE '10' END)
+            AND DATE_FORMAT(r2.enforcement_time, '%Y-%m') &lt;= CONCAT(YEAR(CURDATE()), '-',
+            CASE WHEN QUARTER(CURDATE()) IN (1) THEN '03'
+            WHEN QUARTER(CURDATE()) IN (2) THEN '06'
+            WHEN QUARTER(CURDATE()) IN (3) THEN '09'
+            ELSE '12' END)
+        </if>
+        <if test="bo.dateType != null and bo.dateType == 3">
+            AND DATE_FORMAT(r2.enforcement_time, '%Y') = DATE_FORMAT(CURDATE(), '%Y')
+        </if>
+        <if test="bo.dateSearch != null and bo.dateSearch != ''">
+            AND DATE_FORMAT(r2.enforcement_time, '%Y-%m') = #{bo.dateSearch}
+        </if>
+        <if test="bo.beginTime != null and bo.beginTime != ''">
+            AND DATE_FORMAT(r2.enforcement_time, '%Y-%m-%d') &gt;= #{bo.beginTime}
+        </if>
+        <if test="bo.endTime != null and bo.endTime != ''">
+            AND DATE_FORMAT(r2.enforcement_time, '%Y-%m-%d') &lt;= #{bo.endTime}
+        </if>
         GROUP BY r2.union_no
         HAVING COUNT(1) > 1
         ) t