|
|
|
|
@ -57,6 +57,16 @@ public class DataCaseVerifService extends ServiceImpl<DataCaseVerifMapper, DataC
|
|
|
|
|
if( !queryParam.getDiscoveryTime().isEmpty()){ |
|
|
|
|
queryWrapper.between(DataCaseVerif::getCreateTime,queryParam.getDiscoveryTime().get(0),queryParam.getDiscoveryTime().get(1)); |
|
|
|
|
} |
|
|
|
|
if (StrUtil.isNotBlank(queryParam.getDepartId())){ |
|
|
|
|
List<String> allNodeIds = departService.getAllNodeIds(queryParam.getDepartId()); |
|
|
|
|
if (CollectionUtil.isNotEmpty(allNodeIds)) { |
|
|
|
|
queryWrapper.and(w -> |
|
|
|
|
w.in(DataCaseVerif::getSecondDepartId, allNodeIds) |
|
|
|
|
.or() |
|
|
|
|
.in(DataCaseVerif::getThirdDepartId, allNodeIds) |
|
|
|
|
); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return page(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|