From a3d3e76cac06532f802d77d3127ea34ba01af69e Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Mon, 18 Mar 2024 15:33:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A3=E5=BA=A6/=E5=B9=B4=E5=BA=A6=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/EnforcementRegistrationMapper.xml        | 13 +++++++++++--
 .../mapper/EnterpriseLawEnforcementMapper.xml       | 13 +++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
index 2d7df4b6..8bd26454 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
@@ -80,10 +80,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and DATE_FORMAT(create_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m')
             </if>
             <if test="dateType != null and dateType == 2">
-                and create_time >= DATE_SUB(CURDATE(), INTERVAL 3 MONTH)
+                and create_time >= CONCAT(YEAR(CURDATE()), '-', QUARTER(CURDATE()), '-01')
+                and create_time &lt;= CONCAT(YEAR(CURDATE()), '-',
+                CASE
+                WHEN QUARTER(CURDATE()) IN (1, 2, 3) THEN 3
+                WHEN QUARTER(CURDATE()) IN (4, 5, 6) THEN 6
+                WHEN QUARTER(CURDATE()) IN (7, 8, 9) THEN 9
+                ELSE 12
+                END,
+                '-',
+                DAY(LAST_DAY(CURDATE())))
             </if>
             <if test="dateType != null and dateType == 3">
-                and create_time >= DATE_SUB(CURDATE(), INTERVAL 6 MONTH)
+                and DATE_FORMAT(create_time, '%Y') = DATE_FORMAT(CURDATE(), '%Y')
             </if>
         </where>
         order by create_time desc
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml
index 48eb925a..998b41b0 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml
@@ -60,10 +60,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and DATE_FORMAT(create_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m')
             </if>
             <if test="dateType != null and dateType == 2">
-                and create_time >= DATE_SUB(CURDATE(), INTERVAL 3 MONTH)
+                and create_time >= CONCAT(YEAR(CURDATE()), '-', QUARTER(CURDATE()), '-01')
+                and create_time &lt;= CONCAT(YEAR(CURDATE()), '-',
+                CASE
+                WHEN QUARTER(CURDATE()) IN (1, 2, 3) THEN 3
+                WHEN QUARTER(CURDATE()) IN (4, 5, 6) THEN 6
+                WHEN QUARTER(CURDATE()) IN (7, 8, 9) THEN 9
+                ELSE 12
+                END,
+                '-',
+                DAY(LAST_DAY(CURDATE())))
             </if>
             <if test="dateType != null and dateType == 3">
-                and create_time >= DATE_SUB(CURDATE(), INTERVAL 6 MONTH)
+                and DATE_FORMAT(create_time, '%Y') = DATE_FORMAT(CURDATE(), '%Y')
             </if>
         </where>
         order by create_time desc