From 299c0a2290889aa0247fc8ce8d56849578939f9e Mon Sep 17 00:00:00 2001
From: niujiyi <18272501226@163.com>
Date: Fri, 11 Sep 2026 17:59:19 +0800
Subject: [PATCH] =?UTF-8?q?CIM-=E5=A4=A7=E5=B1=8F=E6=8C=87=E6=A0=87?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../common/util/TbHbUtils.java | 93 +++
.../cim/CimDashboardOverviewController.java | 184 ++++--
.../bo/CimDashboardOverviewQueryBo.java | 5 +
.../domain/vo/CimDashboardOverviewVo.java | 93 ++-
.../mapper/CimDashboardOverviewMapper.java | 67 ++
.../service/ICimDashboardOverviewService.java | 68 ++
.../impl/CimDashboardOverviewServiceImpl.java | 101 +++
.../CimDashboardOverviewMapper.xml | 605 ++++++++++++++++++
8 files changed, 1178 insertions(+), 38 deletions(-)
create mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/TbHbUtils.java
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/TbHbUtils.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/TbHbUtils.java
new file mode 100644
index 00000000..781a3d68
--- /dev/null
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/TbHbUtils.java
@@ -0,0 +1,93 @@
+package com.zdxt.enforcementcode.common.util;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.function.Function;
+
+/**
+ * 同比、环比计算工具类
+ *
+ *
+ * 用法示例：
+ * TbHbUtils.TbHbResult result = TbHbUtils.calculate(
+ * monthTime -> {
+ * bo.setMonthTime(monthTime);
+ * return service.getEnfRegistrationCountByMonth(bo);
+ * },
+ * currentTime
+ * );
+ * vo.setXzzfs(result.currentCount); // 当前数量
+ * vo.setXzzfsTb(result.tb); // 同比增长率
+ * vo.setXzzfsHb(result.hb); // 环比增长率
+ *
+ */
+public class TbHbUtils {
+
+ /**
+ * 同比环比结果
+ */
+ public static class TbHbResult {
+ /** 当前月数量 */
+ public final Long currentCount;
+ /** 去年同月数量 */
+ public final Long lastYearCount;
+ /** 上月数量 */
+ public final Long lastMonthCount;
+ /** 同比增长率（百分比，保留一位小数，如 15.5 表示 +15.5%） */
+ public final Double tb;
+ /** 环比增长率（百分比，保留一位小数，如 -3.2 表示 -3.2%） */
+ public final Double hb;
+
+ public TbHbResult(Long currentCount, Long lastYearCount, Long lastMonthCount,
+ Double tb, Double hb) {
+ this.currentCount = currentCount;
+ this.lastYearCount = lastYearCount;
+ this.lastMonthCount = lastMonthCount;
+ this.tb = tb;
+ this.hb = hb;
+ }
+ }
+
+ /**
+ * 计算同比、环比增长率
+ *
+ * @param countByMonth 传入月份时间，返回该月统计数量的函数
+ * @param currentTime 当前时间（基准月）
+ * @return TbHbResult 包含当前数量、同比、环比
+ */
+ public static TbHbResult calculate(Function countByMonth, Date currentTime) {
+ // 当前月数量
+ Long currentCount = countByMonth.apply(currentTime);
+
+ // 去年同月
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(currentTime);
+ cal.add(Calendar.YEAR, -1);
+ Long lastYearCount = countByMonth.apply(cal.getTime());
+
+ // 上月
+ cal.setTime(currentTime);
+ cal.add(Calendar.MONTH, -1);
+ Long lastMonthCount = countByMonth.apply(cal.getTime());
+
+ Double tb = calculateRate(currentCount, lastYearCount);
+ Double hb = calculateRate(currentCount, lastMonthCount);
+
+ return new TbHbResult(currentCount, lastYearCount, lastMonthCount, tb, hb);
+ }
+
+ /**
+ * 计算增长率
+ *
+ * @param current 当前值
+ * @param previous 上期值（同比时为去年同月，环比时为上月）
+ * @return 增长率百分比（保留一位小数），上期为0或null时：当前有值返回100.0，否则返回0.0
+ */
+ public static Double calculateRate(Long current, Long previous) {
+ long cur = current != null ? current : 0L;
+ if (previous != null && previous > 0) {
+ return Math.round((cur - previous) * 1000.0 / previous) / 10.0;
+ }
+ return cur > 0 ? 100.0 : 0.0;
+ }
+}
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewController.java
index 5231e050..e45d6f45 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewController.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewController.java
@@ -2,6 +2,7 @@ package com.zdxt.enforcementcode.controller.cim;
import cn.dev33.satoken.annotation.SaIgnore;
+import com.zdxt.enforcementcode.common.util.TbHbUtils;
import com.zdxt.enforcementcode.domain.bo.CimDashboardOverviewQueryBo;
import com.zdxt.enforcementcode.domain.vo.CimDashboardOverviewVo;
import com.zdxt.enforcementcode.service.ICimDashboardOverviewService;
@@ -121,14 +122,14 @@ public class CimDashboardOverviewController {
Long ddbmzfCount=cimDashboardOverviewService.getSepDeptLawCount(bo);
vo.setDdbmzf(ddbmzfCount);
//联合执法
- Long lhzfCount= cimDashboardOverviewService.getUnionLawCount(bo);
- vo.setLhzf(lhzfCount);
+ Long lhzfsCount= cimDashboardOverviewService.getUnionLawCount(bo);
+ vo.setLhzfs(lhzfsCount);
//被执法企业
Long bzfqyCount= cimDashboardOverviewService.getSubLawEntCount(bo);
vo.setBzfqy(bzfqyCount);
//入企压减率
Long xzzfCount= cimDashboardOverviewService.getEnfRegistrationCount(bo);
- vo.setRqyjl(xzzfCount-(lhzfCount+ddbmzfCount));
+ vo.setRqyjl(xzzfCount-(lhzfsCount+ddbmzfCount));
//执法人员数
//执法单位数
@@ -297,7 +298,7 @@ public class CimDashboardOverviewController {
/**
- * Cim大屏- 获取 总览概览
+ * Cim大屏- 获取 总览概览 (行政执法数,行政检查案件数，行政处罚案件数，行政强制案件数) + 同比 + 环比
* （月）
* @param bo
* @return
@@ -310,39 +311,150 @@ public class CimDashboardOverviewController {
Date time = new Date(System.currentTimeMillis());
bo.setMonthTime(time);
- // 当前月行政执法数
- Long currentCount = cimDashboardOverviewService.getEnfRegistrationCountByMonth(bo);
- vo.setXzzfs(currentCount);
-
- // ====== 行政执法数同比（与去年同月比较）======
- Calendar cal = Calendar.getInstance();
- cal.setTime(time);
- cal.add(Calendar.YEAR, -1);
- Date lastYearTime = cal.getTime();
- bo.setMonthTime(lastYearTime);
- Long lastYearCount = cimDashboardOverviewService.getEnfRegistrationCountByMonth(bo);
- if (lastYearCount != null && lastYearCount > 0) {
- double tbRate = (currentCount - lastYearCount) * 100.0 / lastYearCount;
- // 保留一位小数
- vo.setXzzfsTb(Math.round(tbRate * 10.0) / 10.0);
- } else {
- // 去年同期无数据，同比增长率记为100
- vo.setXzzfsTb(currentCount > 0 ? 100.0 : 0.0);
- }
-
- // ====== 行政执法数环比（与上月比较）======
- cal.setTime(time);
- cal.add(Calendar.MONTH, -1);
- Date lastMonthTime = cal.getTime();
- bo.setMonthTime(lastMonthTime);
- Long lastMonthCount = cimDashboardOverviewService.getEnfRegistrationCountByMonth(bo);
- if (lastMonthCount != null && lastMonthCount > 0) {
- double hbRate = (currentCount - lastMonthCount) * 100.0 / lastMonthCount;
- vo.setXzzfsHb(Math.round(hbRate * 10.0) / 10.0);
- } else {
- vo.setXzzfsHb(currentCount > 0 ? 100.0 : 0.0);
- }
+ // 行政执法数 + 同比 + 环比
+ TbHbUtils.TbHbResult tbHb = TbHbUtils.calculate(
+ monthTime -> {
+ bo.setMonthTime(monthTime);
+ return cimDashboardOverviewService.getEnfRegistrationCountByMonth(bo);
+ },
+ time
+ );
+ vo.setXzzfs(tbHb.currentCount);
+ vo.setXzzfsTb(tbHb.tb);
+ vo.setXzzfsHb(tbHb.hb);
+
+ // 行政检查案件数 + 同比 + 环比
+ TbHbUtils.TbHbResult checkCasetbHb = TbHbUtils.calculate(
+ monthTime -> {
+ bo.setMonthTime(monthTime);
+ return cimDashboardOverviewService.getCheckCaseCount(bo);
+ },
+ time
+ );
+ vo.setXzjcajs(checkCasetbHb.currentCount);
+ vo.setXzjcajsTb(checkCasetbHb.tb);
+ vo.setXzjcajsHb(checkCasetbHb.hb);
+
+
+ // 行政处罚数 + 同比 + 环比
+ TbHbUtils.TbHbResult xzcfajsTbHb = TbHbUtils.calculate(
+ monthTime -> {
+ bo.setMonthTime(monthTime);
+ return cimDashboardOverviewService.getPenaltyCaseCount(bo);
+ },
+ time
+ );
+ vo.setXzcfajs(xzcfajsTbHb.currentCount);
+ vo.setXzcfajsTb(xzcfajsTbHb.tb);
+ vo.setXzcfajsHb(xzcfajsTbHb.hb);
+
+ // 行政强制案件数 + 同比 + 环比
+ TbHbUtils.TbHbResult xzqzajsTbHb = TbHbUtils.calculate(
+ monthTime -> {
+ bo.setMonthTime(monthTime);
+ return cimDashboardOverviewService.getCompulsoryCaseCount( bo);
+ },
+ time
+ );
+ vo.setXzqzajs(xzqzajsTbHb.currentCount);
+ vo.setXzqzajsTb(xzqzajsTbHb.tb);
+ vo.setXzqzajsHb(xzqzajsTbHb.hb);
return R.ok(vo);
}
+
+ /**
+ * Cim大屏- 获取各区行政执法数，行政执法案件数
+ * (月)
+ */
+ @GetMapping("/getAreaEnfRegistrationAndCaseCount")
+ public R> getAreaEnfRegistrationAndCaseCount(CimDashboardOverviewQueryBo bo){
+ // 获取当前系统时间
+ Date time = new Date(System.currentTimeMillis());
+ bo.setMonthTime(time);
+ List vo= cimDashboardOverviewService.getAreaEnfRegistrationAndCaseCount(bo);
+ return R.ok(vo);
+ }
+
+ /**
+ * Cim大屏- 获取各区行政执法数，行政执法案件数明细
+ * （月）
+ */
+ @SaIgnore
+ @GetMapping("/getAreaEnfRegistrationAndCaseCountDetails")
+ public R> getAreaEnfRegistrationAndCaseCountDetails(CimDashboardOverviewQueryBo bo){
+ // 获取当前系统时间
+ Date time = new Date(System.currentTimeMillis());
+ bo.setMonthTime(time);
+ List vo= cimDashboardOverviewService.getAreaEnfRegistrationAndCaseCountDetails(bo);
+ return R.ok(vo);
+ }
+
+ /**
+ * Cim大屏- 获取领域行政执法数，行政执法案件数
+ * (月)
+ * @param bo
+ * @return
+ */
+ @GetMapping("/getFieldEnfRegistrationAndCaseCount")
+ public R> getFieldEnfRegistrationAndCaseCount(CimDashboardOverviewQueryBo bo){
+ // 获取当前系统时间
+ Date time = new Date(System.currentTimeMillis());
+ bo.setMonthTime(time);
+ List vo= cimDashboardOverviewService.getFieldEnfRegistrationAndCaseCount(bo);
+ return R.ok(vo);
+ }
+
+ /**
+ * Cim大屏- 获取领域行政执法数，行政执法案件数明细
+ *（月）
+ * @param bo
+ * @return
+ */
+ @GetMapping("/getFieldEnfRegistrationAndCaseCountDetails")
+ public R> getFieldEnfRegistrationAndCaseCountDetails(CimDashboardOverviewQueryBo bo){
+ // 获取当前系统时间
+ Date time = new Date(System.currentTimeMillis());
+ bo.setMonthTime(time);
+ List vo= cimDashboardOverviewService.getFieldEnfRegistrationAndCaseCountDetails(bo);
+ return R.ok(vo);
+ }
+
+ /**
+ * Cim大屏- 获取重点企业数(月)
+ *
+ */
+ @GetMapping("/getKeyEnterprises")
+ public R> getKeyEnterprises(CimDashboardOverviewQueryBo bo){
+ // 获取当前系统时间
+ Date time = new Date(System.currentTimeMillis());
+ bo.setMonthTime(time);
+ List vo= cimDashboardOverviewService.getKeyEnterprises(bo);
+ return R.ok(vo);
+ }
+
+ /**
+ * Cim大屏- 获取重点企业行政执法明细（日）
+ */
+ @GetMapping("/getKeyEnterpriseEnfRegDetails")
+ public R> getKeyEnterpriseEnfRegDetails(CimDashboardOverviewQueryBo bo){
+ // 获取当前系统时间
+ Date time = new Date(System.currentTimeMillis());
+ bo.setDayTime(time);
+ List vo= cimDashboardOverviewService.getKeyEnterpriseEnfRegDetails(bo);
+ return R.ok(vo);
+ }
+
+ /**
+ * Cim大屏-获取涉企登记趋势（月）
+ */
+ @GetMapping("/getEnfRegistrationTrend")
+ public R> getEnfRegistrationTrend(CimDashboardOverviewQueryBo bo){
+ // 获取当前系统时间
+ Date time = new Date(System.currentTimeMillis());
+ bo.setMonthTime(time);
+ List vo= cimDashboardOverviewService.getEnfRegistrationTrend(bo);
+ return R.ok(vo);
+ }
+
}
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/CimDashboardOverviewQueryBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/CimDashboardOverviewQueryBo.java
index 9a68c43c..076baba7 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/CimDashboardOverviewQueryBo.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/CimDashboardOverviewQueryBo.java
@@ -35,4 +35,9 @@ public class CimDashboardOverviewQueryBo {
*/
private Date yearTime;
+ /**
+ * 企业统一信用代码
+ */
+ private String enterpriseNumber;
+
}
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/CimDashboardOverviewVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/CimDashboardOverviewVo.java
index 9f8f6a3d..99a70c69 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/CimDashboardOverviewVo.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/CimDashboardOverviewVo.java
@@ -3,6 +3,8 @@ package com.zdxt.enforcementcode.domain.vo;
import lombok.Data;
+import java.util.Date;
+
@Data
public class CimDashboardOverviewVo {
@@ -68,9 +70,9 @@ public class CimDashboardOverviewVo {
private Long ddbmzf;
/**
- * 联合执法
+ * 联合执法数
*/
- private Long lhzf;
+ private Long lhzfs;
/**
* 被执法企业
@@ -142,6 +144,11 @@ public class CimDashboardOverviewVo {
*/
private String enterpriseName;
+ /**
+ * 企业地址
+ */
+ private String enterpriseAddress;
+
/**
* 执法部门ID
*/
@@ -151,4 +158,86 @@ public class CimDashboardOverviewVo {
* 执法部门名称
*/
private String bureauDeptName;
+
+ /**
+ * 执法案件数
+ */
+ private Long zfajs;
+
+ /**
+ * 行政检查案件数
+ */
+ private Long xzjcajs;
+
+ /**
+ * 行政检查案件数同比
+ */
+ private Double xzjcajsTb;
+
+ /**
+ * 行政检查案件数环比
+ */
+ private Double xzjcajsHb;
+
+ /**
+ * 行政处罚案件数
+ */
+ private Long xzcfajs;
+
+ /**
+ * 行政处罚案件数同比
+ */
+ private Double xzcfajsTb;
+
+ /**
+ * 行政处罚案件数环比
+ */
+ private Double xzcfajsHb;
+
+ /**
+ * 行政强制案件数
+ */
+ private Long xzqzajs;
+
+ /**
+ * 行政强制案件数同比
+ */
+ private Double xzqzajsTb;
+
+ /**
+ * 行政强制案件数环比
+ */
+ private Double xzqzajsHb;
+
+ /**
+ * 执法时间
+ */
+ private Date enforcementTime;
+
+ /**
+ * 执法事项
+ */
+ private String lawEnforcementItemText;
+
+ /**
+ * 执法人员（多人）
+ */
+ private String lawEnforcerTwo;
+
+ /**
+ * 执法人员
+ */
+ private String lawEnforcer;
+
+ /**
+ * 执法部门
+ */
+ private String lawEnforcement;
+
+ /**
+ * 统计月份
+ */
+ private String statMonth;
+
+
}
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/CimDashboardOverviewMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/CimDashboardOverviewMapper.java
index 9ebe087c..5d971ff2 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/CimDashboardOverviewMapper.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/CimDashboardOverviewMapper.java
@@ -153,4 +153,71 @@ public interface CimDashboardOverviewMapper {
* 获取高频检查企业 （月）
*/
List getHighCheckEnt(CimDashboardOverviewQueryBo bo);
+
+ /**
+ * 获取行政检查案件数（月）
+ * @param bo
+ * @return
+ */
+ Long getCheckCaseCount(CimDashboardOverviewQueryBo bo);
+
+ /**
+ * 获取行政处罚案件数（月）
+ * @param bo
+ * @return
+ */
+ Long getPenaltyCaseCount(CimDashboardOverviewQueryBo bo);
+
+ /**
+ * 获取强制措施案件数（月）
+ * @param bo
+ * @return
+ */
+ Long getCompulsoryCaseCount(CimDashboardOverviewQueryBo bo);
+
+ /**
+ * 获取各区行政执法数，行政执法案件数（月）
+ * @param bo
+ * @return
+ */
+ List getAreaEnfRegistrationAndCaseCount(CimDashboardOverviewQueryBo bo);
+
+ /**
+ * 获取各区行政执法数，行政执法案件数明细（月）
+ * @param bo
+ * @return
+ */
+ List getAreaEnfRegistrationAndCaseCountDetails(CimDashboardOverviewQueryBo bo);
+
+ /**
+ * 获取领域行政执法数，行政执法案件数（月）
+ * @param bo
+ * @return
+ */
+ List getFieldEnfRegistrationAndCaseCount(CimDashboardOverviewQueryBo bo);
+
+ /**
+ * 获取领域行政执法数，行政执法案件数明细（月）
+ * @param bo
+ * @return
+ */
+ List getFieldEnfRegistrationAndCaseCountDetails(CimDashboardOverviewQueryBo bo);
+
+ /**
+ * 获取重点企业数(月)
+ **/
+ List getKeyEnterprises(CimDashboardOverviewQueryBo bo);
+
+ /**
+ * 获取重点企业行政执法明细（日）
+ **/
+ List getKeyEnterpriseEnfRegDetails(CimDashboardOverviewQueryBo bo);
+
+
+ /**
+ * 获取涉企登记趋势（月）
+ **/
+ List getEnfRegistrationTrend(CimDashboardOverviewQueryBo bo);
+
+
}
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ICimDashboardOverviewService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ICimDashboardOverviewService.java
index 1275a0fe..257874b9 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ICimDashboardOverviewService.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ICimDashboardOverviewService.java
@@ -158,4 +158,72 @@ public interface ICimDashboardOverviewService {
* 获取高频检查企业 （月）
*/
List getHighCheckEnt(CimDashboardOverviewQueryBo bo);
+
+
+ /**
+ * 获取行政检查案件数（月）
+ * @param bo
+ * @return
+ */
+ Long getCheckCaseCount(CimDashboardOverviewQueryBo bo);
+
+ /**
+ * 获取行政处罚案件数（月）
+ * @param bo
+ * @return
+ */
+ Long getPenaltyCaseCount(CimDashboardOverviewQueryBo bo);
+
+ /**
+ * 获取强制措施案件数（月）
+ * @param bo
+ * @return
+ */
+ Long getCompulsoryCaseCount(CimDashboardOverviewQueryBo bo);
+
+
+ /**
+ * 获取各区行政执法数，行政执法案件数（月）
+ * @param bo
+ * @return
+ */
+ List getAreaEnfRegistrationAndCaseCount(CimDashboardOverviewQueryBo bo);
+
+ /**
+ * 获取各区行政执法数，行政执法案件数明细（月）
+ * @param bo
+ * @return
+ */
+ List getAreaEnfRegistrationAndCaseCountDetails(CimDashboardOverviewQueryBo bo);
+
+ /**
+ * 获取领域行政执法数，行政执法案件数（月）
+ * @param bo
+ * @return
+ */
+ List getFieldEnfRegistrationAndCaseCount(CimDashboardOverviewQueryBo bo);
+
+ /**
+ * 获取领域行政执法数，行政执法案件数明细（月）
+ * @param bo
+ * @return
+ */
+ List getFieldEnfRegistrationAndCaseCountDetails(CimDashboardOverviewQueryBo bo);
+
+
+ /**
+ * 获取重点企业数(月)
+ **/
+ List getKeyEnterprises(CimDashboardOverviewQueryBo bo);
+
+ /**
+ * 获取重点企业行政执法明细（日）
+ **/
+ List getKeyEnterpriseEnfRegDetails(CimDashboardOverviewQueryBo bo);
+
+
+ /**
+ * 获取涉企登记趋势（月）
+ **/
+ List getEnfRegistrationTrend(CimDashboardOverviewQueryBo bo);
}
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewServiceImpl.java
index 57bc8140..2bef1175 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewServiceImpl.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewServiceImpl.java
@@ -248,5 +248,106 @@ public class CimDashboardOverviewServiceImpl implements ICimDashboardOverviewSer
return cimDashboardOverviewMapper.getHighCheckEnt(bo);
}
+ /**
+ * 获取检查案件数（月）
+ * @param bo
+ * @return
+ */
+ @Override
+ public Long getCheckCaseCount(CimDashboardOverviewQueryBo bo) {
+ return cimDashboardOverviewMapper.getCheckCaseCount(bo);
+ }
+
+ /**
+ * 获取处罚案件数（月）
+ * @param bo
+ * @return
+ */
+ @Override
+ public Long getPenaltyCaseCount(CimDashboardOverviewQueryBo bo) {
+ return cimDashboardOverviewMapper.getPenaltyCaseCount( bo);
+ }
+
+ /**
+ * 获取强制案件数（月）
+ * @param bo
+ * @return
+ */
+ @Override
+ public Long getCompulsoryCaseCount(CimDashboardOverviewQueryBo bo) {
+ return cimDashboardOverviewMapper.getCompulsoryCaseCount( bo);
+ }
+
+ /**
+ * 获取各区行政检查数和案件数（月）
+ * @param bo
+ * @return
+ */
+ @Override
+ public List getAreaEnfRegistrationAndCaseCount(CimDashboardOverviewQueryBo bo) {
+ return cimDashboardOverviewMapper.getAreaEnfRegistrationAndCaseCount(bo);
+ }
+
+ /**
+ * 获取各区行政检查数和案件数（月）详情
+ * @param bo
+ * @return
+ */
+ @Override
+ public List getAreaEnfRegistrationAndCaseCountDetails(CimDashboardOverviewQueryBo bo) {
+ return cimDashboardOverviewMapper.getAreaEnfRegistrationAndCaseCountDetails( bo);
+ }
+
+
+ /**
+ * 获取各领域行政检查数和案件数（月）
+ * @param bo
+ * @return
+ */
+ @Override
+ public List getFieldEnfRegistrationAndCaseCount(CimDashboardOverviewQueryBo bo) {
+ return cimDashboardOverviewMapper.getFieldEnfRegistrationAndCaseCount( bo);
+ }
+
+ /**
+ * 获取各领域行政检查数和案件数（月）详情
+ * @param bo
+ * @return
+ */
+ @Override
+ public List getFieldEnfRegistrationAndCaseCountDetails(CimDashboardOverviewQueryBo bo) {
+ return cimDashboardOverviewMapper.getFieldEnfRegistrationAndCaseCountDetails( bo);
+ }
+
+ /**
+ * 获取重点企业数(月)
+ * @param bo
+ * @return
+ */
+ @Override
+ public List getKeyEnterprises(CimDashboardOverviewQueryBo bo) {
+ return cimDashboardOverviewMapper.getKeyEnterprises( bo);
+ }
+
+ /**
+ * 获取重点企业行政执法明细（日）
+ * @param bo
+ * @return
+ */
+ @Override
+ public List getKeyEnterpriseEnfRegDetails(CimDashboardOverviewQueryBo bo) {
+ return cimDashboardOverviewMapper.getKeyEnterpriseEnfRegDetails( bo);
+ }
+
+ /**
+ * 获取涉企登记趋势（月）
+ * @param bo
+ * @return
+ */
+ @Override
+ public List getEnfRegistrationTrend(CimDashboardOverviewQueryBo bo) {
+ return cimDashboardOverviewMapper.getEnfRegistrationTrend(bo);
+ }
+
}
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/CimDashboardOverviewMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/CimDashboardOverviewMapper.xml
index f1d7cea6..8279f46b 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/CimDashboardOverviewMapper.xml
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/CimDashboardOverviewMapper.xml
@@ -52,6 +52,9 @@
and t3.code = #{code}
+
+ and t1.enterprise_number = #{enterpriseNumber}
+
@@ -70,6 +73,12 @@
and DATE_FORMAT(t1.enforcement_time,'%Y-%m-%d') = DATE_FORMAT(#{dayTime},'%Y-%m-%d')
+
+ and DATE_FORMAT(t1.enforcement_time,'%Y-%m-%d') = DATE_FORMAT(#{monthTime},'%Y-%m-%d')
+
+
+ and t1.enterprise_number = #{enterpriseNumber}
+
and t3.code = #{code}
@@ -299,6 +308,12 @@
and t3.code = #{code}
+
+ and DATE_FORMAT(t1.enforcement_time,'%Y-%m') = DATE_FORMAT(#{monthTime},'%Y-%m')
+
+
+ and t1.enterprise_number = #{enterpriseNumber}
+ "
GROUP BY t1.union_no
HAVING COUNT(1) > 1
@@ -804,4 +819,594 @@
t3.code ,
t3.name
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+