From 56ce907164612ca1ca1a5b7504810f136ecc877d Mon Sep 17 00:00:00 2001
From: niujiyi <18272501226@163.com>
Date: Tue, 23 Jun 2026 17:05:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9LawEnforcementIntensityDetail?=
 =?UTF-8?q?Vo=20=E5=8C=85=E5=BC=95=E7=94=A8=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/enforcement/AppComprehensiveAnalysisController.java    | 3 +++
 .../domain/vo/dashboard/LawEnforcementIntensityDetailVo.java   | 2 +-
 .../zdxt/enforcementcode/mapper/DashboardOverviewMapper.java   | 3 ++-
 .../service/impl/DashboardOverviewServiceImpl.java             | 2 +-
 .../mapper/enforcementcode/DashboardOverviewMapper.xml         | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppComprehensiveAnalysisController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppComprehensiveAnalysisController.java
index 3b6e55c3..99bdd9b9 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppComprehensiveAnalysisController.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppComprehensiveAnalysisController.java
@@ -19,6 +19,9 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+/**
+ * 执法端-统计分析
+ */
 @Controller
 @RequestMapping("/app-enf/appComprehensiveAnalysis")
 public class AppComprehensiveAnalysisController extends BaseController {
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/dashboard/LawEnforcementIntensityDetailVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/dashboard/LawEnforcementIntensityDetailVo.java
index 958ea610..36895f24 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/dashboard/LawEnforcementIntensityDetailVo.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/dashboard/LawEnforcementIntensityDetailVo.java
@@ -1,4 +1,4 @@
-package com.zdxt.enforcementcode.domain.vo;
+package com.zdxt.enforcementcode.domain.vo.dashboard;
 
 import lombok.Data;
 
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardOverviewMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardOverviewMapper.java
index da69f129..c464169e 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardOverviewMapper.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardOverviewMapper.java
@@ -11,6 +11,7 @@ import com.zdxt.enforcementcode.domain.vo.DashboardOverviewVo;
 import com.zdxt.enforcementcode.domain.vo.LawEnforcementIntensityVo;
 import com.zdxt.enforcementcode.domain.vo.LawEnforcementIntensityCountVo;
 import com.zdxt.enforcementcode.domain.vo.dashboard.LawEnforcementCountVo;
+import com.zdxt.enforcementcode.domain.vo.dashboard.LawEnforcementIntensityDetailVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 import java.util.List;
@@ -139,6 +140,6 @@ public interface DashboardOverviewMapper extends BaseMapperPlus<DashboardOvervie
      * @param bo 查询条件
      * @return 执法力度统计（行政检查数、行政处罚数、行政强制数、其他）
      */
-    com.zdxt.enforcementcode.domain.vo.LawEnforcementIntensityDetailVo queryLawEnforcementIntensityDetail(com.zdxt.enforcementcode.domain.bo.dashboard.LawEnforcementStatBo bo);
+    LawEnforcementIntensityDetailVo queryLawEnforcementIntensityDetail(com.zdxt.enforcementcode.domain.bo.dashboard.LawEnforcementStatBo bo);
 
 }
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardOverviewServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardOverviewServiceImpl.java
index e1640186..0d2ad154 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardOverviewServiceImpl.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardOverviewServiceImpl.java
@@ -6,7 +6,7 @@ import com.zdxt.enforcementcode.domain.bean.DashboardOverview;
 import com.zdxt.enforcementcode.domain.bo.*;
 import com.zdxt.enforcementcode.domain.vo.*;
 
-import com.zdxt.enforcementcode.domain.vo.LawEnforcementIntensityDetailVo;
+import com.zdxt.enforcementcode.domain.vo.dashboard.LawEnforcementIntensityDetailVo;
 import com.zdxt.enforcementcode.domain.vo.dashboard.LawEnforcementCountVo;
 import com.zdxt.enforcementcode.service.IDashboardAreaInfoService;
 import org.dromara.common.core.utils.MapstructUtils;
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardOverviewMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardOverviewMapper.xml
index 94ff87fb..e4f7ab84 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardOverviewMapper.xml
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardOverviewMapper.xml
@@ -475,7 +475,7 @@
     </select>
 
     <!-- 统计执法力度（按区域和月份） -->
-    <select id="queryLawEnforcementIntensityDetail" resultType="com.zdxt.enforcementcode.domain.vo.LawEnforcementIntensityDetailVo">
+    <select id="queryLawEnforcementIntensityDetail" resultType="com.zdxt.enforcementcode.domain.vo.dashboard.LawEnforcementIntensityDetailVo">
         SELECT
             SUM(IF(er.law_enforce_category = 1, 1, 0)) AS administrativeInspection,
             SUM(IF(er.law_enforce_category = 2, 1, 0)) AS administrativePenalty,