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 c964bf7a..c7947f98 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 @@ -46,15 +46,15 @@ AND is_complaint = #{bo.isComplaint} - } - AND enforce_reason is null + + AND check_css is null - - AND enforce_reason is not null - - - AND check_css = #{bo.checkCss} + + AND check_css is not null + + + AND (enterprise_address LIKE CONCAT('深圳市', SUBSTRING_INDEX(#{bo.district}, '区', 1), '区%') OR enterprise_address LIKE CONCAT('深圳市', SUBSTRING_INDEX(#{bo.district}, '区', 1), '新区%')) @@ -172,15 +172,15 @@ AND r2.is_complaint = #{bo.isComplaint} - } - AND r2.enforce_reason is null - - - AND r2.enforce_reason is not null + + AND r2.check_css is null - - AND r2.check_css = #{bo.checkCss} + + AND r2.check_css is not null + + + AND (r2.enterprise_address LIKE CONCAT('深圳市', SUBSTRING_INDEX(#{bo.district}, '区', 1), '区%') OR r2.enterprise_address LIKE CONCAT('深圳市', SUBSTRING_INDEX(#{bo.district}, '区', 1), '新区%')) @@ -271,15 +271,15 @@ AND r.is_complaint = #{bo.isComplaint} - } - AND r.enforce_reason is null + + AND r.check_css is null - - AND r.enforce_reason is not null - - - AND r.check_css = #{bo.checkCss} + + AND r.check_css is not null + + + AND (r.enterprise_address LIKE CONCAT('深圳市', SUBSTRING_INDEX(#{bo.district}, '区', 1), '区%') OR r.enterprise_address LIKE CONCAT('深圳市', SUBSTRING_INDEX(#{bo.district}, '区', 1), '新区%')) @@ -420,15 +420,15 @@ AND er.is_complaint = #{bo.isComplaint} - - AND er.enforce_reason is null - - - AND er.enforce_reason is not null + + AND er.check_css is null - - AND er.check_css = #{bo.checkCss} + + AND er.check_css is not null + + + AND (er.enterprise_address LIKE CONCAT('深圳市', SUBSTRING_INDEX(#{bo.district}, '区', 1), '区%') OR er.enterprise_address LIKE CONCAT('深圳市', SUBSTRING_INDEX(#{bo.district}, '区', 1), '新区%'))