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')
- and create_time >= DATE_SUB(CURDATE(), INTERVAL 3 MONTH)
+ and create_time >= CONCAT(YEAR(CURDATE()), '-', QUARTER(CURDATE()), '-01')
+ and create_time <= 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())))
- and create_time >= DATE_SUB(CURDATE(), INTERVAL 6 MONTH)
+ and DATE_FORMAT(create_time, '%Y') = DATE_FORMAT(CURDATE(), '%Y')
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')
- and create_time >= DATE_SUB(CURDATE(), INTERVAL 3 MONTH)
+ and create_time >= CONCAT(YEAR(CURDATE()), '-', QUARTER(CURDATE()), '-01')
+ and create_time <= 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())))
- and create_time >= DATE_SUB(CURDATE(), INTERVAL 6 MONTH)
+ and DATE_FORMAT(create_time, '%Y') = DATE_FORMAT(CURDATE(), '%Y')
order by create_time desc