|
|
|
|
@ -60,6 +60,13 @@ public class DataPetitionComplaintService extends ServiceImpl<DataPetitionCompla
|
|
|
|
|
.eq(StrUtil.isNotBlank(queryParam.getInitialPetition()), "pc.initial_petition", queryParam.getInitialPetition()) |
|
|
|
|
.in(CollectionUtil.isNotEmpty(queryParam.getInvolvedIssue()),"pc.involved_issue",queryParam.getInvolvedIssue()) |
|
|
|
|
.orderByDesc("pc.discovery_time"); |
|
|
|
|
if (StrUtil.isNotBlank(queryParam.getVisitType())) { |
|
|
|
|
if ("1".equals(queryParam.getVisitType())) { |
|
|
|
|
queryWrapper.eq("pc.mass_visits", true); |
|
|
|
|
} else if ("0".equals(queryParam.getVisitType())) { |
|
|
|
|
queryWrapper.eq("pc.mass_visits", false); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if (queryParam.getDiscoveryTime().size() == 2) { |
|
|
|
|
queryWrapper.between("pc.discovery_time", queryParam.getDiscoveryTime().get(0), queryParam.getDiscoveryTime().get(1)); |
|
|
|
|
} |
|
|
|
|
|