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 d226af9..cba2448 100644 --- a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneSupervisionNotifyController.java +++ b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneSupervisionNotifyController.java @@ -119,7 +119,6 @@ public class SubOneSupervisionNotifyController { @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { endTime = DateUtil.endOfDay(endTime); - //, ProblemSourcesEnum.SPDC.getValue() 去除视频督察 //获取时间范围内 属于对应二级单位的数据 List negatives = negativeMapper.selectList(new LambdaQueryWrapper().between(Negative::getCrtTime, beginTime, endTime) @@ -133,20 +132,15 @@ public class SubOneSupervisionNotifyController { overView.setCompletedNumber(negatives.stream().filter(item -> ProcessingStatusEnum.completed.name().equals(item.getProcessingStatus())).count()); //办理中 overView.setProcessingNumber(negatives.size() - overView.getCompletedNumber()); - //问题期数 Long problemQuarter = superviseReportService.count(new LambdaQueryWrapper() .eq(SuperviseReport::getCrtDepartId,departId) .between(SuperviseReport::getCrtTime,beginTime,endTime)); overView.setProblemQuarter(problemQuarter); - LambdaQueryWrapper queryWrapper=new LambdaQueryWrapper<>(); List orgIds = departService.getAllNodeIds(String.valueOf(departId)); queryWrapper.in(SuperviseReport::getCrtDepartId, orgIds); - overView.setReportNumber(superviseReportService.count(queryWrapper)); - - // 办结率 // overView.setCompletedRate(overView.getProblemNumber() == 0 ? 0: NumberUtil.roundHalfEven(NumberUtil.mul(NumberUtil.div(overView.getCompletedNumber(), overView.getProblemNumber()), 100), 0).doubleValue()); CompletableFuture.allOf( @@ -169,7 +163,6 @@ public class SubOneSupervisionNotifyController { overView.setDepartNumber(departNumber); }) ).join(); - JSONObject data = new JSONObject().fluentPut("overview", overView); return Result.success(data); } diff --git a/src/main/java/com/biutag/supervision/service/MailService.java b/src/main/java/com/biutag/supervision/service/MailService.java index a809334..672f66b 100644 --- a/src/main/java/com/biutag/supervision/service/MailService.java +++ b/src/main/java/com/biutag/supervision/service/MailService.java @@ -187,6 +187,12 @@ public class MailService extends ServiceImpl { // 涉及个人 dataMailbox.setAccountabilityTarget(AccountabilityTargetEnum.PERSONAL.getValue()); dataMailbox.setCrtTime(LocalDateTime.now()); + if("涉冻".equals(item.getMailCategory())){ + dataMailbox.setInvolvedIssue("涉冻问题"); + } + if("涉企".equals(item.getMailCategory())){ + dataMailbox.setInvolvedIssue("涉企问题"); + } dataMailboxService.save(dataMailbox); // 被举报人