From fc14e4e1b755519d300ac088bc30f2f6b6e887dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E7=88=B1=E5=AD=A6=E4=B9=A0=E7=9A=84=E7=9F=B3?=
 =?UTF-8?q?=E5=90=8C=E5=AD=A6?= <2936013465@qq.com>
Date: Thu, 14 Nov 2024 19:52:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=A4=A7=E5=B1=8F=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF1.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/datav/DataGobalController.java | 19 +++++++++----------
 .../supervision/service/DataGobalService.java |  2 +-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataGobalController.java b/src/main/java/com/biutag/supervision/controller/datav/DataGobalController.java
index 22d1d6a..5cd231e 100644
--- a/src/main/java/com/biutag/supervision/controller/datav/DataGobalController.java
+++ b/src/main/java/com/biutag/supervision/controller/datav/DataGobalController.java
@@ -85,16 +85,15 @@ public class DataGobalController {
             updateProList(policeProList, gobalMapVoList, GobalMapIconVo::setPolicePro);
             updateProList(reviewProList, gobalMapVoList, GobalMapIconVo::setReviewPro);
         }else {
-            gobalTempMapVoList.add(new GobalMapIconVo("芙蓉分局", 11,11,11,11,11,11));
-            gobalTempMapVoList.add(new GobalMapIconVo("天心分局", 22,22,22,22,22,22));
-            gobalTempMapVoList.add(new GobalMapIconVo("岳麓分局", 33,33,33,33,33,33));
-            gobalTempMapVoList.add(new GobalMapIconVo("开福分局", 44,44,44,44,44,44));
-            gobalTempMapVoList.add(new GobalMapIconVo("雨花分局", 55,55,55,55,55,55));
-            gobalTempMapVoList.add(new GobalMapIconVo("长沙县局", 66,66,66,66,66,66));
-            gobalTempMapVoList.add(new GobalMapIconVo("望城分局", 77,77,77,77,77,77));
-            gobalTempMapVoList.add(new GobalMapIconVo("宁乡市局", 88,88,88,88,88,88));
-            gobalTempMapVoList.add(new GobalMapIconVo("浏阳市局", 99,99,99,99,99,99));
-            gobalTempMapVoList.add(new GobalMapIconVo("高新分局", 100,100,100,100,100,100));
+            gobalTempMapVoList.add(new GobalMapIconVo("芙蓉分局", 1,11,11,11,11,11));
+            gobalTempMapVoList.add(new GobalMapIconVo("天心分局", 2,22,22,22,22,22));
+            gobalTempMapVoList.add(new GobalMapIconVo("岳麓分局", 3,33,33,33,33,33));
+            gobalTempMapVoList.add(new GobalMapIconVo("开福分局", 4,44,44,44,44,44));
+            gobalTempMapVoList.add(new GobalMapIconVo("雨花分局", 5,55,55,55,55,55));
+            gobalTempMapVoList.add(new GobalMapIconVo("长沙县局", 6,66,66,66,66,66));
+            gobalTempMapVoList.add(new GobalMapIconVo("望城分局", 7,77,77,77,77,77));
+            gobalTempMapVoList.add(new GobalMapIconVo("宁乡市局", 8,88,88,88,88,88));
+            gobalTempMapVoList.add(new GobalMapIconVo("浏阳市局", 9,99,99,99,99,99));
         }
 
         JSONObject data = new JSONObject().fluentPut("overview", overview)
diff --git a/src/main/java/com/biutag/supervision/service/DataGobalService.java b/src/main/java/com/biutag/supervision/service/DataGobalService.java
index 4f02afa..df9df44 100644
--- a/src/main/java/com/biutag/supervision/service/DataGobalService.java
+++ b/src/main/java/com/biutag/supervision/service/DataGobalService.java
@@ -86,7 +86,7 @@ public class DataGobalService {
     public Long getCountByConditions(Integer checkStatus, Date startTime, Date endTime, Integer... problemSourcesCodes) {
         QueryWrapper<Negative> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("checkStatus", checkStatus)
-                .between("crtTime", startTime, endTime)
+                .between("discoveryTime", startTime, endTime)
                 .and(wrapper -> {
                     for (int i = 0; i < problemSourcesCodes.length; i++) {
                         if (i == 0) {