补充权限注解，新增查询字段

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java

@@ -183,6 +183,7 @@ public class EnforcementRegistration extends BaseDomain
     /** 是否牵头单位 */
     private int uniteType;
 
+
     public String getDeptQx() {
         return deptQx;
     }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicatorPart.java

@@ -53,6 +53,23 @@ public class StatisticsIndicatorPart extends BaseDomain {
     private String beginTime;
     private String endTime;
 
+
+    /**
+     * 是否全部数据权限
+     */
+    private String isAllData;
+    /**
+     * 区 搜索条件
+     */
+    private String region;
+    /**
+     * 街道 搜索条件
+     */
+    private String street;
+
+
+
+
     public String getName() {
         return name;
     }
@@ -180,4 +197,28 @@ public class StatisticsIndicatorPart extends BaseDomain {
     public void setHuanValue(Double huanValue) {
         this.huanValue = huanValue;
     }
+
+    public String getRegion() {
+        return region;
+    }
+
+    public void setRegion(String region) {
+        this.region = region;
+    }
+
+    public String getStreet() {
+        return street;
+    }
+
+    public void setStreet(String street) {
+        this.street = street;
+    }
+
+    public String getIsAllData() {
+        return isAllData;
+    }
+
+    public void setIsAllData(String isAllData) {
+        this.isAllData = isAllData;
+    }
 }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java

@@ -380,6 +380,7 @@ public class StatisticalPaneServiceImpl implements StatisticalPaneService {
     @DataScope
     @Override
     public StatisticsIndicatorPart registrationNew(StatisticsIndicatorPart statisticsIndicatorPart) {
+
         //获取当前用户所在执法部门ID
         String deptId = takeDeptId();
         //获取当前部门执法数据

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml

@@ -205,6 +205,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
                 and DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')
             </if>
+            <choose>
+                <when test="params.dataScope != null and params.dataScope != ''">
+                    and  dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = #{deptId} or find_in_set( #{deptId} , ancestors ) <![CDATA[ <> ]]> 0 )
+                </when>
+                <!--默认开启权限搜索 -->
+                <otherwise>
+                    ${params.dataScope}
+                </otherwise>
+            </choose>
         </where>
             order by create_time desc
     </select>
@@ -517,7 +526,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-<!--
+    <!--
     <select id="countMentByTime" resultMap="EnforceRegCountResult"
             resultType="com.zdxt.code.domain.EnforceRegCount">
         SELECT law_enforcement, law_enforcement_id,enterprise_number, COUNT(law_enforcement_id) AS num