From d73a1b92c09b068d0596b05aba9552d95f15c0c9 Mon Sep 17 00:00:00 2001
From: chenrui <1950717904@qq.com>
Date: Tue, 25 Feb 2025 10:01:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=9D=83=E9=99=90=E6=B3=A8?=
=?UTF-8?q?=E8=A7=A3=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../code/domain/EnforcementRegistration.java | 1 +
.../code/domain/StatisticsIndicatorPart.java | 41 +++++++
.../impl/StatisticalPaneServiceImpl.java | 1 +
.../mapper/EnforcementRegistrationMapper.xml | 115 ++++++++++--------
4 files changed, 105 insertions(+), 53 deletions(-)
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java
index 6c9ea3c7..57dd0a12 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java
+++ b/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;
}
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicatorPart.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicatorPart.java
index 72f0b76b..103a50c9 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicatorPart.java
+++ b/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;
+ }
}
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java
index b0c25394..c6fd4bab 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java
+++ b/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();
//获取当前部门执法数据
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
index 191add42..0be63a41 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
@@ -154,59 +154,68 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by enforcement_time desc