From f3c7dcdc251a56f58681f036912d0f5377d7d28d Mon Sep 17 00:00:00 2001
From: niujiyi <18272501226@163.com>
Date: Fri, 30 Oct 2026 15:46:50 +0800
Subject: [PATCH] =?UTF-8?q?cim-=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CimDashboardOverviewDataSumController.java | 18 +++++++++---------
 .../ICimDashboardOverviewDataSumService.java   |  2 +-
 ...imDashboardOverviewDataSumSserviceImpl.java |  9 ++++++---
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewDataSumController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewDataSumController.java
index cf8fe227..d0aa2261 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewDataSumController.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewDataSumController.java
@@ -43,10 +43,10 @@ public class CimDashboardOverviewDataSumController {
      * @return
      */
     @GetMapping("/getDashboardOverviewMonthDataSum")
-    public R<List<CimDashboardOverviewVo>> getDashboardOverviewMonthDataSum() {
+    public R<Map<String,Object>> getDashboardOverviewMonthDataSum(CimDashboardOverviewQueryBo bo) {
         //查询大屏总览数据（月度）
-        List<CimDashboardOverviewVo> vo= cimDashboardOverviewDataSumService.getDashboardOverviewMonthDataSum();
-        return R.ok(vo);
+        Map<String,Object> map= cimDashboardOverviewDataSumService.getDashboardOverviewMonthDataSum(bo);
+        return R.ok(map);
     }
 
     /**
@@ -54,10 +54,10 @@ public class CimDashboardOverviewDataSumController {
      * @return
      */
     @GetMapping("/getDashboardOverviewMonthDataEntSum")
-    public R<List<CimDashboardOverviewVo>> getDashboardOverviewMonthDataEntSum() {
+    public R<Map<String,Object>> getDashboardOverviewMonthDataEntSum(CimDashboardOverviewQueryBo bo) {
         //查询大屏总览数据（月度）
-        List<CimDashboardOverviewVo> vo= cimDashboardOverviewDataSumService.getDashboardOverviewMonthDataSum();
-        return R.ok(vo);
+        Map<String,Object> map= cimDashboardOverviewDataSumService.getDashboardOverviewMonthDataSum(bo);
+        return R.ok(map);
     }
 
     /**
@@ -65,10 +65,10 @@ public class CimDashboardOverviewDataSumController {
      * @return
      */
     @GetMapping("/getDashboardOverviewMonthDataPenUnitSum")
-    public R<List<CimDashboardOverviewVo>> getDashboardOverviewMonthDataPenUnitSum() {
+    public R<Map<String,Object>> getDashboardOverviewMonthDataPenUnitSum(CimDashboardOverviewQueryBo bo) {
         //查询大屏总览数据（月度）
-        List<CimDashboardOverviewVo> vo= cimDashboardOverviewDataSumService.getDashboardOverviewMonthDataSum();
-        return R.ok(vo);
+        Map<String,Object> map= cimDashboardOverviewDataSumService.getDashboardOverviewMonthDataSum(bo);
+        return R.ok(map);
     }
 
     /**
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ICimDashboardOverviewDataSumService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ICimDashboardOverviewDataSumService.java
index 09cef0d9..efe239f3 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ICimDashboardOverviewDataSumService.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ICimDashboardOverviewDataSumService.java
@@ -33,7 +33,7 @@ public interface ICimDashboardOverviewDataSumService {
      * Cim大屏-查询大屏总览汇总月度数据
      * @return
      */
-    List<CimDashboardOverviewVo> getDashboardOverviewMonthDataSum();
+    Map<String,Object> getDashboardOverviewMonthDataSum(CimDashboardOverviewQueryBo bo);
 
     /**
      * Cim大屏-按区域条件查询月度数据
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java
index 9df7a93a..f669c72c 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java
@@ -200,13 +200,16 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve
      * @return
      */
     @Override
-    public List<CimDashboardOverviewVo> getDashboardOverviewMonthDataSum() {
-
+    public Map<String ,Object> getDashboardOverviewMonthDataSum(CimDashboardOverviewQueryBo bo) {
+        Map<String ,Object> map=new HashMap<>();
         LambdaQueryWrapper<DashboardOverview> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(DashboardOverview::getIsDelete, "0");
         queryWrapper.eq(DashboardOverview::getYear, getDateTime().getYear());
         queryWrapper.eq(DashboardOverview::getMonth, getDateTime().getMonth());
-        return cimDashboardOverviewMapper.selectVoList(queryWrapper);
+
+        map.put("monthData",cimDashboardOverviewMapper.selectVoList(queryWrapper));
+        map.put("areaMonthData",getDashboardOverviewAreaMonthDataSum(bo));
+        return map;
     }
 
     /**