Browse Source

fix--支持多选

master
parent
commit
a00fd2fbe7
  1. 2
      src/main/java/com/biutag/supervision/pojo/param/DataCaseVerifQueryParam.java
  2. 22
      src/main/java/com/biutag/supervision/service/DataCaseVerifService.java
  3. 2
      src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java

2
src/main/java/com/biutag/supervision/pojo/param/DataCaseVerifQueryParam.java

@ -27,7 +27,7 @@ public class DataCaseVerifQueryParam extends BasePage {
private String distributionState; private String distributionState;
private String checkStatus; // 是否属实 private List<String> checkStatus; // 是否属实
private List<String> involvedIssue; private List<String> involvedIssue;

22
src/main/java/com/biutag/supervision/service/DataCaseVerifService.java

@ -25,10 +25,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Collections; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@RequiredArgsConstructor @RequiredArgsConstructor
@ -75,17 +72,20 @@ public class DataCaseVerifService extends ServiceImpl<DataCaseVerifMapper, DataC
} }
// 是否属实:改查 negative.check_status_code // 是否属实:改查 negative.check_status_code
if (StrUtil.isNotBlank(queryParam.getCheckStatus())) { if (CollectionUtil.isNotEmpty(queryParam.getCheckStatus())) {
LambdaQueryWrapper<Negative> negativeWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Negative> negativeWrapper = new LambdaQueryWrapper<>();
negativeWrapper.select(Negative::getOriginId) negativeWrapper.select(Negative::getOriginId)
.eq(Negative::getCheckStatusCode, queryParam.getCheckStatus()); .in(Negative::getCheckStatusCode, queryParam.getCheckStatus());
List<Negative> negativeList = negativeService.list(negativeWrapper); List<Negative> negativeList = negativeService.list(negativeWrapper);
List<String> originIds = negativeList.stream() List<String> originIds = Optional.ofNullable(negativeList)
.orElse(Collections.emptyList())
.stream()
.filter(Objects::nonNull)
.map(Negative::getOriginId) .map(Negative::getOriginId)
.filter(StrUtil::isNotBlank) .filter(StrUtil::isNotBlank)
.distinct() .distinct()
.toList(); .collect(Collectors.toList());
if (CollUtil.isEmpty(originIds)) { if (CollUtil.isEmpty(originIds)) {
return Page.<DataCaseVerif>of(queryParam.getCurrent(), queryParam.getSize()) return Page.<DataCaseVerif>of(queryParam.getCurrent(), queryParam.getSize())
@ -108,7 +108,11 @@ public class DataCaseVerifService extends ServiceImpl<DataCaseVerifMapper, DataC
wrapper.in(Negative::getOriginId, originIds) wrapper.in(Negative::getOriginId, originIds)
.select(Negative::getOriginId, Negative::getCheckStatusCode); .select(Negative::getOriginId, Negative::getCheckStatusCode);
List<Negative> negatives = negativeService.list(wrapper); List<Negative> negatives = negativeService.list(wrapper);
Map<String, String> map = negatives.stream() Map<String, String> map = Optional.ofNullable(negatives)
.orElse(Collections.emptyList())
.stream()
.filter(Objects::nonNull)
.filter(item -> StrUtil.isNotBlank(item.getOriginId()))
.collect(Collectors.toMap( .collect(Collectors.toMap(
Negative::getOriginId, Negative::getOriginId,
Negative::getCheckStatusCode, Negative::getCheckStatusCode,

2
src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java

@ -370,7 +370,7 @@ public class DatavServiceImpl implements DatavService {
long ajhcCount = dataCaseVerifResourceService.count(ajhcQueryParam); long ajhcCount = dataCaseVerifResourceService.count(ajhcQueryParam);
// 局长信箱 // 局长信箱
MailQueryParam mailQueryParam = new MailQueryParam(); MailQueryParam mailQueryParam = new MailQueryParam();
mailQueryParam.setCreateTime(dates); mailQueryParam.setMailTime(dates);
long jzxxCount = mailResourceService.count(mailQueryParam); long jzxxCount = mailResourceService.count(mailQueryParam);
// 12337 // 12337

Loading…
Cancel
Save