监督端-联合查询时间筛选

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