Browse Source

fix--审计监督报错

master
buaixuexideshitongxue 4 weeks ago
parent
commit
2ee53d587e
  1. 7
      src/main/java/com/biutag/supervision/controller/datav/DataVAuditController.java

7
src/main/java/com/biutag/supervision/controller/datav/DataVAuditController.java

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

Loading…
Cancel
Save