修复监督端涉企执法bug

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/RegistrationController.java

@@ -1,5 +1,6 @@
 package com.zdxt.enforcementcode.controller.web.supervision.report;
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo;
 import com.zdxt.enforcementcode.domain.vo.EnforcementRegistrationVo;
 import com.zdxt.enforcementcode.domain.vo.report.ChartDataVo;

zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/report/EnforcementRegistrationReportMapper.xml

@@ -46,8 +46,11 @@
         <if test="bo.isComplaint != null">
             AND is_complaint = #{bo.isComplaint}
         </if>
-        <if test="bo.enforce != null and bo.enforce != ''">
+        <if test="bo.enforce != null and bo.enforce == '0'">}
-            AND enforce = #{bo.enforce}
+            AND enforce_reason is null
+        </if>
+        <if test="bo.enforce != null and bo.enforce == '1'">
+            AND enforce_reason is not null
         </if>
         <if test="bo.checkCss != null and bo.checkCss != ''">
             AND check_css = #{bo.checkCss}
@@ -146,7 +149,7 @@
         </if>
         <if test="bo.lawEnforcer != null and bo.lawEnforcer != ''">
             AND (law_enforcer LIKE CONCAT('%', #{bo.lawEnforcer}, '%')
-            ORr. law_enforcer_two LIKE CONCAT('%', #{bo.lawEnforcer}, '%'))
+            OR r2.law_enforcer_two LIKE CONCAT('%', #{bo.lawEnforcer}, '%'))
         </if>
         <if test="bo.enterpriseName != null and bo.enterpriseName != ''">
             AND r2.enterprise_name LIKE CONCAT('%', #{bo.enterpriseName}, '%')
@@ -169,8 +172,11 @@
         <if test="bo.isComplaint != null">
             AND r2.is_complaint = #{bo.isComplaint}
         </if>
-        <if test="bo.enforce != null and bo.enforce != ''">
+        <if test="bo.enforce != null and bo.enforce == '0'">}
-            AND r2.enforce = #{bo.enforce}
+            AND r2.enforce_reason is null
+        </if>
+        <if test="bo.enforce != null and bo.enforce == '1'">
+            AND r2.enforce_reason is not null
         </if>
         <if test="bo.checkCss != null and bo.checkCss != ''">
             AND r2.check_css = #{bo.checkCss}
@@ -241,8 +247,8 @@
             AND r.bureau_dept_name LIKE CONCAT('%', #{bo.bureauDeptName}, '%')
         </if>
         <if test="bo.lawEnforcer != null and bo.lawEnforcer != ''">
-            AND (law_enforcer LIKE CONCAT('%', #{bo.lawEnforcer}, '%')
+            AND (r.law_enforcer LIKE CONCAT('%', #{bo.lawEnforcer}, '%')
-            ORr. law_enforcer_two LIKE CONCAT('%', #{bo.lawEnforcer}, '%'))
+            OR r.law_enforcer_two LIKE CONCAT('%', #{bo.lawEnforcer}, '%'))
         </if>
         <if test="bo.enterpriseName != null and bo.enterpriseName != ''">
             AND r.enterprise_name LIKE CONCAT('%', #{bo.enterpriseName}, '%')
@@ -265,8 +271,11 @@
         <if test="bo.isComplaint != null">
             AND r.is_complaint = #{bo.isComplaint}
         </if>
-        <if test="bo.enforce != null and bo.enforce != ''">
+        <if test="bo.enforce != null and bo.enforce == '0'">}
-            AND r.enforce = #{bo.enforce}
+            AND r.enforce_reason is null
+        </if>
+        <if test="bo.enforce != null and bo.enforce == '1'">
+            AND r.enforce_reason is not null
         </if>
         <if test="bo.checkCss != null and bo.checkCss != ''">
             AND r.check_css = #{bo.checkCss}
@@ -411,8 +420,11 @@
             <if test="bo.isComplaint != null">
                 AND er.is_complaint = #{bo.isComplaint}
             </if>
-            <if test="bo.enforce != null and bo.enforce != ''">
+            <if test="bo.enforce != null and bo.enforce == '0'">
-                AND er.enforce = #{bo.enforce}
+                AND er.enforce_reason is null
+            </if>
+            <if test="bo.enforce != null and bo.enforce == '1'">
+                AND er.enforce_reason is not null
             </if>
             <if test="bo.checkCss != null and bo.checkCss != ''">
                 AND er.check_css = #{bo.checkCss}