diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVAuditController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVAuditController.java index cea9eab..c0d0352 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataVAuditController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataVAuditController.java @@ -1,5 +1,6 @@ package com.biutag.supervision.controller.datav; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -72,11 +73,15 @@ public class DataVAuditController { @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { List negatives = negativeService.list(new LambdaQueryWrapper().between(Negative::getCrtTime, beginTime, DateUtil.endOfDay(endTime)) .in(Negative::getProblemSourcesCode, List.of(ProblemSourcesEnum.ZFTZSJ.getValue(), ProblemSourcesEnum.ZFSACFSS.getValue(), ProblemSourcesEnum.JJZRSJ.getValue(), ProblemSourcesEnum.ZXSJ.getValue()))); - long accountableNumber = negativeBlameService.count(new LambdaQueryWrapper().in(NegativeBlame::getNegativeId, negatives.stream().map(Negative::getId).collect(Collectors.toSet())) - .ne(NegativeBlame::getHandleResultName, "不予追责")); + long accountableNumber = 0; + if (CollectionUtil.isNotEmpty(negatives)){ + accountableNumber = negativeBlameService.count(new LambdaQueryWrapper().in(NegativeBlame::getNegativeId, negatives.stream().map(Negative::getId).collect(Collectors.toSet())) + .ne(NegativeBlame::getHandleResultName, "不予追责")); + } LambdaQueryWrapper projectLambdaQueryWrapper = new LambdaQueryWrapper<>(); projectLambdaQueryWrapper.eq(ReportProject::getNode, ReportProjectNodeEnum.END); projectLambdaQueryWrapper.eq(ReportProject::getDeleteFlag, DeleteStatusEnum.NO.getCode()); + projectLambdaQueryWrapper.between(ReportProject::getApplicantTime, beginTime, endTime); List reportProjects = reportProjectMapper.selectList(projectLambdaQueryWrapper); BigDecimal totalReportMoney = reportProjects.stream().map(ReportProject::getReportMoney).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP); ; BigDecimal totalArchivingReduceMoney = reportProjects.stream().map(ReportProject::getArchivingReduceMoney).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP);