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 d735152..3d600f1 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java @@ -136,7 +136,7 @@ public class DataVCaseVerifController { List list = Arrays.asList( A12389.getValue(),SLDJB.getValue(), ZDDJB.getValue(), SJJB.getValue()); long confirmed = negativeMapper.selectCount(new LambdaQueryWrapper().in(Negative::getProblemSourcesCode,list).between(Negative::getCrtTime,beginTime,endTime)); - long total =dataCaseVerifMapper.selectCount(new LambdaQueryWrapper().between(DataCaseVerif::getCreateTime,beginTime,endTime)); + long total = dataCaseVerifMapper.selectCount(new LambdaQueryWrapper().between(DataCaseVerif::getCreateTime,beginTime,endTime)); overview.setTotal((int) total); overview.setConfirmed((int) confirmed); // overview.setRate((double) ((overview.getConfirmed() / total * 100) )); 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 97adc2a..aa37b75 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataVSupervisionNotifyController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataVSupervisionNotifyController.java @@ -188,7 +188,7 @@ public class DataVSupervisionNotifyController { * @param beginTime 开始时间 * @param endTime 结束时间 */ - @Operation(summary = "地图Icon数据") + @Operation(summary = "获取现场专项地图数据") @GetMapping("/getSupervisionNotifyMap") public Result getSupervisionNotifyMap(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @@ -199,12 +199,13 @@ public class DataVSupervisionNotifyController { //数据补充 Date finalEndTime = endTime; superviseTempMapVoList.forEach(s->{ - String relationOrg =negativeMapper.getSupervisionMapStringData(beginTime, finalEndTime,"department",s.getDepartId()) ; - String personNum =negativeMapper.getSupervisionMapStringData(beginTime, finalEndTime,"personal",s.getDepartId()) ;; - String completedRate = negativeMapper.getSupervisionMapCompletedRate(beginTime, finalEndTime,s.getDepartId()); - s.setCompletedRate(completedRate); - s.setPersonNum(personNum); - s.setRelationOrg(relationOrg); + String relationOrg =negativeMapper.getSupervisionMapStringData(beginTime, finalEndTime,"department",s.getDepartId()) ; + String personNum =negativeMapper.getSupervisionMapStringData(beginTime, finalEndTime,"personal",s.getDepartId()) ;; + // String completedRate = negativeMapper.getSupervisionMapCompletedRate(beginTime, finalEndTime,s.getDepartId()); + double rate = s.getTotalPro() == 0 ? 0: NumberUtil.round((double) s.getCompletedNumber() / s.getTotalPro() * 100, 2).doubleValue(); + s.setCompletedRate(String.valueOf(rate)); + s.setPersonNum(personNum); + s.setRelationOrg(relationOrg); }); JSONObject data = new JSONObject().fluentPut("superviseTempMapVoList", superviseTempMapVoList); return Result.success(data); diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVVideoSuperviseController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVVideoSuperviseController.java index 1298f7b..7dc4561 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataVVideoSuperviseController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataVVideoSuperviseController.java @@ -115,7 +115,7 @@ public class DataVVideoSuperviseController { * @param endTime 结束时间 * @return */ - @Operation(summary = "地图Icon数据") + @Operation(summary = "获取视频督察地图数据") @GetMapping("/getVideoSuperviseMap") public Result getVideoSuperviseMap(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { diff --git a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneSupervisionNotifyController.java b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneSupervisionNotifyController.java index 5286398..2d004ff 100644 --- a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneSupervisionNotifyController.java +++ b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneSupervisionNotifyController.java @@ -214,9 +214,9 @@ public class SubOneSupervisionNotifyController { //问责人数 、问责单位数 CompletableFuture.allOf( CompletableFutureUtil.runSyncObject(()->{ - superviseMapIconVo.setTotalPro(String.valueOf(negatives.size())); + superviseMapIconVo.setTotalPro(negatives.size()); //已办理 - superviseMapIconVo.setCompletedNumber(negatives.stream().filter(item ->ProcessingStatusEnum.completed.name().equals(item.getProcessingStatus())).count()); + superviseMapIconVo.setCompletedNumber((int) negatives.stream().filter(item ->ProcessingStatusEnum.completed.name().equals(item.getProcessingStatus())).count()); //办理中 superviseMapIconVo.setProcessingNumber(negatives.size() - superviseMapIconVo.getCompletedNumber()); }), diff --git a/src/main/java/com/biutag/supervision/pojo/vo/SuperviseMapIconVo.java b/src/main/java/com/biutag/supervision/pojo/vo/SuperviseMapIconVo.java index e2e721b..832f1b1 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/SuperviseMapIconVo.java +++ b/src/main/java/com/biutag/supervision/pojo/vo/SuperviseMapIconVo.java @@ -13,9 +13,9 @@ import java.io.Serializable; public class SuperviseMapIconVo implements Serializable { private String name; // 分县市局名 private String departId; - private String totalPro; - private Long processingNumber; - private Long completedNumber; + private Integer totalPro; + private Integer processingNumber; + private Integer completedNumber; private String relationOrg; private String personNum; private String completedRate;