From b354cab0299fe7b2e490ba83f46eebaf5ebacd58 Mon Sep 17 00:00:00 2001 From: ganhao Date: Tue, 23 Jun 2026 10:17:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=95=E8=AF=89?= =?UTF-8?q?=E5=B9=BF=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/sql/zfjd-refactoring-v1/其他/njy/njy.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 script/sql/zfjd-refactoring-v1/其他/njy/njy.sql diff --git a/script/sql/zfjd-refactoring-v1/其他/njy/njy.sql b/script/sql/zfjd-refactoring-v1/其他/njy/njy.sql new file mode 100644 index 00000000..2d45a038 --- /dev/null +++ b/script/sql/zfjd-refactoring-v1/其他/njy/njy.sql @@ -0,0 +1,3 @@ +ALTER TABLE enterprise_complaint + ADD COLUMN detailed_address varchar(200) DEFAULT NULL COMMENT '详细地址' +AFTER enterprise_address; 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 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9LawEnforcementIntensityDe?= =?UTF-8?q?tailVo=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 - SELECT SUM(IF(er.law_enforce_category = 1, 1, 0)) AS administrativeInspection, SUM(IF(er.law_enforce_category = 2, 1, 0)) AS administrativePenalty,