季度/年度查询修改

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

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