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) + + + AND DATE_FORMAT(r2.enforcement_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m') + + + AND DATE_FORMAT(r2.enforcement_time, '%Y-%m') >= 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') <= 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) + + + AND DATE_FORMAT(r2.enforcement_time, '%Y') = DATE_FORMAT(CURDATE(), '%Y') + + + AND DATE_FORMAT(r2.enforcement_time, '%Y-%m') = #{bo.dateSearch} + + + AND DATE_FORMAT(r2.enforcement_time, '%Y-%m-%d') >= #{bo.beginTime} + + + AND DATE_FORMAT(r2.enforcement_time, '%Y-%m-%d') <= #{bo.endTime} + GROUP BY r2.union_no HAVING COUNT(1) > 1 ) t