From 4c6410af6ffb56909169661ab778ed86dbb9f801 Mon Sep 17 00:00:00 2001 From: pengwei Date: Thu, 29 May 2025 15:21:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=201=E3=80=81=E7=BB=B4=E6=9D=83=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F=E4=BC=98=E5=8C=96=EF=BC=88=E5=8F=97=E4=BE=B5=E5=AE=B3?= =?UTF-8?q?=E4=BA=BA=E6=95=B0=EF=BC=89;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/datav/DataVCaseVerifController.java | 7 ++++--- .../controller/datav/DataVRightsComfortController.java | 1 + .../controller/datav/DataVSupervisionNotifyController.java | 3 +++ .../java/com/biutag/supervision/mapper/NegativeMapper.java | 4 +++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java index 0d69530..77488bc 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java @@ -156,10 +156,11 @@ public class DataVCaseVerifController { Date finalEndTime = DateUtil.endOfDay(endTime); List caseVerificationMapList = negativeMapper.getCaseVerificationMap(beginTime, finalEndTime); caseVerificationMapList =caseVerificationMapList.stream().map(s->{ - long total =dataCaseVerifMapper.selectCount(new LambdaQueryWrapper().between(DataCaseVerif::getCreateTime,beginTime,finalEndTime)); - s.setTotal((int) total); +// long total =dataCaseVerifMapper.selectCount(new LambdaQueryWrapper().between(DataCaseVerif::getCreateTime,beginTime,finalEndTime) +// .eq(DataCaseVerif::getSecondDepartId,s.)); +// s.setTotal((int) total); - s.setRate(NumberUtil.div((Number)( s.getConfirmed() * 100),total ).doubleValue()); +// s.setRate(NumberUtil.div((Number)( s.getConfirmed() * 100),total ).doubleValue()); return s; }).toList(); JSONObject res = new JSONObject().fluentPut("caseVerificationMapList", caseVerificationMapList); diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java index e2a46bd..e172681 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java @@ -192,6 +192,7 @@ public class DataVRightsComfortController { .between(RpcApply::getCrtTime, beginTime, finalEndTime) .eq(RpcApply::getSecondDepartId,departId) .eq(RpcApply::getType, RpcApplyTypeEnum.RIGHTS_PROTECTION.getValue())); + Set caseNumbers = list.stream().map(RpcApply::getCaseNumber).collect(Collectors.toSet()); // 维权案件总数 diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVSupervisionNotifyController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVSupervisionNotifyController.java index 88fb932..5ce0987 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataVSupervisionNotifyController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataVSupervisionNotifyController.java @@ -146,6 +146,7 @@ public class DataVSupervisionNotifyController { public Result getSupervisionNotifyMap(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { + endTime = DateUtil.endOfDay(endTime); //地图数据 List superviseTempMapVoList = negativeMapper.getSupervisionMapIconInfo(beginTime, endTime); JSONObject data = new JSONObject().fluentPut("superviseTempMapVoList", superviseTempMapVoList); @@ -181,6 +182,7 @@ public class DataVSupervisionNotifyController { public Result getYellowBetDrug(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime, String dictValue) { + endTime = DateUtil.endOfDay(endTime); // 分县市局 DayTimeSuperviseVo countyOverview = negativeMapper.getYellowBetOverview(beginTime, endTime, 3, dictValue); List countyRankList = negativeMapper.getYellowBetRankList(beginTime, endTime, 3, dictValue); @@ -207,6 +209,7 @@ public class DataVSupervisionNotifyController { @GetMapping("/getWorkDynamics") public Result> getWorkDynamics(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { + endTime = DateUtil.endOfDay(endTime); List newsList = newsService.getWorkDynamics(beginTime, endTime, DCGZDT, null); return Result.success(newsList); } diff --git a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java index 05d6f80..ec9632a 100644 --- a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java @@ -238,7 +238,9 @@ public interface NegativeMapper extends BaseMapper { "WHERE problemSourcesCode = 16 " + "AND ng.crtTime BETWEEN #{beginTime} AND #{endTime}") VideoSuperviseCountVo getAllVideoSuperviseCount(Date beginTime, Date endTime); - + /** + * 问题类型占比 + * */ @Select("SELECT npr.threeLevelContent AS `name`, " + "COUNT(*) AS `value` " + "FROM negative ng " +