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 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) {