|
|
|
|
@ -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<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()))); |
|
|
|
|
long accountableNumber = negativeBlameService.count(new LambdaQueryWrapper<NegativeBlame>().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<NegativeBlame>().in(NegativeBlame::getNegativeId, negatives.stream().map(Negative::getId).collect(Collectors.toSet())) |
|
|
|
|
.ne(NegativeBlame::getHandleResultName, "不予追责")); |
|
|
|
|
} |
|
|
|
|
LambdaQueryWrapper<ReportProject> projectLambdaQueryWrapper = new LambdaQueryWrapper<>(); |
|
|
|
|
projectLambdaQueryWrapper.eq(ReportProject::getNode, ReportProjectNodeEnum.END); |
|
|
|
|
projectLambdaQueryWrapper.eq(ReportProject::getDeleteFlag, DeleteStatusEnum.NO.getCode()); |
|
|
|
|
projectLambdaQueryWrapper.between(ReportProject::getApplicantTime, beginTime, endTime); |
|
|
|
|
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 totalArchivingReduceMoney = reportProjects.stream().map(ReportProject::getArchivingReduceMoney).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP); |
|
|
|
|
|